From: Greg Kroah-Hartman Date: Tue, 10 Oct 2017 15:52:08 +0000 (+0200) Subject: drop a bunch of broken patches... X-Git-Tag: v3.18.75~10 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cb2612799768a7983e6c482a74e1a131a91f1a3c;p=thirdparty%2Fkernel%2Fstable-queue.git drop a bunch of broken patches... --- diff --git a/queue-4.13/intel_th-pci-add-cedar-fork-pch-support.patch b/queue-4.13/intel_th-pci-add-cedar-fork-pch-support.patch deleted file mode 100644 index d30c765c9e5..00000000000 --- a/queue-4.13/intel_th-pci-add-cedar-fork-pch-support.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 920ce7c33db25cf4acb4ade3ae8c93bd23dfd730 Mon Sep 17 00:00:00 2001 -From: Alexander Shishkin -Date: Tue, 19 Sep 2017 18:47:41 +0300 -Subject: intel_th: pci: Add Cedar Fork PCH support - -From: Alexander Shishkin - -commit 920ce7c33db25cf4acb4ade3ae8c93bd23dfd730 upstream. - -This adds Intel(R) Trace Hub PCI ID for Cedar Fork PCH. - -Signed-off-by: Alexander Shishkin -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/hwtracing/intel_th/pci.c | 5 +++++ - 1 file changed, 5 insertions(+) - ---- a/drivers/hwtracing/intel_th/pci.c -+++ b/drivers/hwtracing/intel_th/pci.c -@@ -105,6 +105,11 @@ static const struct pci_device_id intel_ - PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x9da6), - .driver_data = (kernel_ulong_t)0, - }, -+ { -+ /* Cedar Fork PCH */ -+ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x18e1), -+ .driver_data = (kernel_ulong_t)&intel_th_2x, -+ }, - { 0 }, - }; - diff --git a/queue-4.13/series b/queue-4.13/series index 4f5db99de26..cc7880b4858 100644 --- a/queue-4.13/series +++ b/queue-4.13/series @@ -110,7 +110,6 @@ powerpc-fix-action-argument-for-cpufeatures-based-tlb-flush.patch powerpc-64s-use-emergency-stack-for-kernel-tm-bad-thing-program-checks.patch powerpc-tm-fix-illegal-tm-state-in-signal-handler.patch percpu-make-this_cpu_generic_read-atomic-w.r.t.-interrupts.patch -intel_th-pci-add-cedar-fork-pch-support.patch intel_th-pci-add-lewisburg-pch-support.patch driver-core-platform-don-t-read-past-the-end-of-driver_override-buffer.patch cgroup-reinit-cgroup_taskset-structure-before-cgroup_migrate_execute-returns.patch diff --git a/queue-4.4/intel_th-pci-add-cedar-fork-pch-support.patch b/queue-4.4/intel_th-pci-add-cedar-fork-pch-support.patch deleted file mode 100644 index 79ce0ae263d..00000000000 --- a/queue-4.4/intel_th-pci-add-cedar-fork-pch-support.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 920ce7c33db25cf4acb4ade3ae8c93bd23dfd730 Mon Sep 17 00:00:00 2001 -From: Alexander Shishkin -Date: Tue, 19 Sep 2017 18:47:41 +0300 -Subject: intel_th: pci: Add Cedar Fork PCH support - -From: Alexander Shishkin - -commit 920ce7c33db25cf4acb4ade3ae8c93bd23dfd730 upstream. - -This adds Intel(R) Trace Hub PCI ID for Cedar Fork PCH. - -Signed-off-by: Alexander Shishkin -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/hwtracing/intel_th/pci.c | 5 +++++ - 1 file changed, 5 insertions(+) - ---- a/drivers/hwtracing/intel_th/pci.c -+++ b/drivers/hwtracing/intel_th/pci.c -@@ -82,6 +82,11 @@ static const struct pci_device_id intel_ - PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x9da6), - .driver_data = (kernel_ulong_t)0, - }, -+ { -+ /* Cedar Fork PCH */ -+ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x18e1), -+ .driver_data = (kernel_ulong_t)&intel_th_2x, -+ }, - { 0 }, - }; - diff --git a/queue-4.4/intel_th-pci-add-lewisburg-pch-support.patch b/queue-4.4/intel_th-pci-add-lewisburg-pch-support.patch deleted file mode 100644 index ba031b5a938..00000000000 --- a/queue-4.4/intel_th-pci-add-lewisburg-pch-support.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 24600840c74112ad04a9ddd99d7d7f731dcaa1cb Mon Sep 17 00:00:00 2001 -From: Alexander Shishkin -Date: Tue, 19 Sep 2017 18:47:42 +0300 -Subject: intel_th: pci: Add Lewisburg PCH support - -From: Alexander Shishkin - -commit 24600840c74112ad04a9ddd99d7d7f731dcaa1cb upstream. - -This adds Intel(R) Trace Hub PCI ID for Lewisburg PCH. - -Signed-off-by: Alexander Shishkin -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/hwtracing/intel_th/pci.c | 5 +++++ - 1 file changed, 5 insertions(+) - ---- a/drivers/hwtracing/intel_th/pci.c -+++ b/drivers/hwtracing/intel_th/pci.c -@@ -83,6 +83,11 @@ static const struct pci_device_id intel_ - .driver_data = (kernel_ulong_t)0, - }, - { -+ /* Lewisburg PCH */ -+ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xa1a6), -+ .driver_data = (kernel_ulong_t)0, -+ }, -+ { - /* Cedar Fork PCH */ - PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x18e1), - .driver_data = (kernel_ulong_t)&intel_th_2x, diff --git a/queue-4.4/series b/queue-4.4/series index a7505b604ea..d01d017f946 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -16,8 +16,6 @@ usb-g_mass_storage-fix-deadlock-when-driver-is-unbound.patch lsm-fix-smack_inode_removexattr-and-xattr_getsecurity-memleak.patch alsa-compress-remove-unused-variable.patch alsa-usx2y-suppress-kernel-warning-at-page-allocation-failures.patch -intel_th-pci-add-cedar-fork-pch-support.patch -intel_th-pci-add-lewisburg-pch-support.patch driver-core-platform-don-t-read-past-the-end-of-driver_override-buffer.patch drivers-hv-fcopy-restore-correct-transfer-length.patch stm-class-fix-a-use-after-free.patch diff --git a/queue-4.9/dm-ioctl-fix-alignment-of-event-number-in-the-device-list.patch b/queue-4.9/dm-ioctl-fix-alignment-of-event-number-in-the-device-list.patch deleted file mode 100644 index d4eadf25021..00000000000 --- a/queue-4.9/dm-ioctl-fix-alignment-of-event-number-in-the-device-list.patch +++ /dev/null @@ -1,203 +0,0 @@ -From 62e082430ea4bb5b28909ca4375bb683931e22aa Mon Sep 17 00:00:00 2001 -From: Mikulas Patocka -Date: Wed, 20 Sep 2017 07:29:49 -0400 -Subject: dm ioctl: fix alignment of event number in the device list - -From: Mikulas Patocka - -commit 62e082430ea4bb5b28909ca4375bb683931e22aa upstream. - -The size of struct dm_name_list is different on 32-bit and 64-bit -kernels (so "(nl + 1)" differs between 32-bit and 64-bit kernels). - -This mismatch caused some harmless difference in padding when using 32-bit -or 64-bit kernel. Commit 23d70c5e52dd ("dm ioctl: report event number in -DM_LIST_DEVICES") added reporting event number in the output of -DM_LIST_DEVICES_CMD. This difference in padding makes it impossible for -userspace to determine the location of the event number (the location -would be different when running on 32-bit and 64-bit kernels). - -Fix the padding by using offsetof(struct dm_name_list, name) instead of -sizeof(struct dm_name_list) to determine the location of entries. - -Also, the ioctl version number is incremented to 37 so that userspace -can use the version number to determine that the event number is present -and correctly located. - -In addition, a global event is now raised when a DM device is created, -removed, renamed or when table is swapped, so that the user can monitor -for device changes. - -Reported-by: Eugene Syromiatnikov -Fixes: 23d70c5e52dd ("dm ioctl: report event number in DM_LIST_DEVICES") -Signed-off-by: Mikulas Patocka -Signed-off-by: Mike Snitzer -Signed-off-by: Greg Kroah-Hartman - -diff --git a/drivers/md/dm-core.h b/drivers/md/dm-core.h -index 24eddbdf2ab4..203144762f36 100644 ---- a/drivers/md/dm-core.h -+++ b/drivers/md/dm-core.h -@@ -149,5 +149,6 @@ static inline bool dm_message_test_buffer_overflow(char *result, unsigned maxlen - - extern atomic_t dm_global_event_nr; - extern wait_queue_head_t dm_global_eventq; -+void dm_issue_global_event(void); - - #endif -diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c -index 8756a6850431..e52676fa9832 100644 ---- a/drivers/md/dm-ioctl.c -+++ b/drivers/md/dm-ioctl.c -@@ -477,9 +477,13 @@ static int remove_all(struct file *filp, struct dm_ioctl *param, size_t param_si - * Round up the ptr to an 8-byte boundary. - */ - #define ALIGN_MASK 7 -+static inline size_t align_val(size_t val) -+{ -+ return (val + ALIGN_MASK) & ~ALIGN_MASK; -+} - static inline void *align_ptr(void *ptr) - { -- return (void *) (((size_t) (ptr + ALIGN_MASK)) & ~ALIGN_MASK); -+ return (void *)align_val((size_t)ptr); - } - - /* -@@ -505,7 +509,7 @@ static int list_devices(struct file *filp, struct dm_ioctl *param, size_t param_ - struct hash_cell *hc; - size_t len, needed = 0; - struct gendisk *disk; -- struct dm_name_list *nl, *old_nl = NULL; -+ struct dm_name_list *orig_nl, *nl, *old_nl = NULL; - uint32_t *event_nr; - - down_write(&_hash_lock); -@@ -516,17 +520,15 @@ static int list_devices(struct file *filp, struct dm_ioctl *param, size_t param_ - */ - for (i = 0; i < NUM_BUCKETS; i++) { - list_for_each_entry (hc, _name_buckets + i, name_list) { -- needed += sizeof(struct dm_name_list); -- needed += strlen(hc->name) + 1; -- needed += ALIGN_MASK; -- needed += (sizeof(uint32_t) + ALIGN_MASK) & ~ALIGN_MASK; -+ needed += align_val(offsetof(struct dm_name_list, name) + strlen(hc->name) + 1); -+ needed += align_val(sizeof(uint32_t)); - } - } - - /* - * Grab our output buffer. - */ -- nl = get_result_buffer(param, param_size, &len); -+ nl = orig_nl = get_result_buffer(param, param_size, &len); - if (len < needed) { - param->flags |= DM_BUFFER_FULL_FLAG; - goto out; -@@ -549,11 +551,16 @@ static int list_devices(struct file *filp, struct dm_ioctl *param, size_t param_ - strcpy(nl->name, hc->name); - - old_nl = nl; -- event_nr = align_ptr(((void *) (nl + 1)) + strlen(hc->name) + 1); -+ event_nr = align_ptr(nl->name + strlen(hc->name) + 1); - *event_nr = dm_get_event_nr(hc->md); - nl = align_ptr(event_nr + 1); - } - } -+ /* -+ * If mismatch happens, security may be compromised due to buffer -+ * overflow, so it's better to crash. -+ */ -+ BUG_ON((char *)nl - (char *)orig_nl != needed); - - out: - up_write(&_hash_lock); -@@ -1621,7 +1628,8 @@ static int target_message(struct file *filp, struct dm_ioctl *param, size_t para - * which has a variable size, is not used by the function processing - * the ioctl. - */ --#define IOCTL_FLAGS_NO_PARAMS 1 -+#define IOCTL_FLAGS_NO_PARAMS 1 -+#define IOCTL_FLAGS_ISSUE_GLOBAL_EVENT 2 - - /*----------------------------------------------------------------- - * Implementation of open/close/ioctl on the special char -@@ -1635,12 +1643,12 @@ static ioctl_fn lookup_ioctl(unsigned int cmd, int *ioctl_flags) - ioctl_fn fn; - } _ioctls[] = { - {DM_VERSION_CMD, 0, NULL}, /* version is dealt with elsewhere */ -- {DM_REMOVE_ALL_CMD, IOCTL_FLAGS_NO_PARAMS, remove_all}, -+ {DM_REMOVE_ALL_CMD, IOCTL_FLAGS_NO_PARAMS | IOCTL_FLAGS_ISSUE_GLOBAL_EVENT, remove_all}, - {DM_LIST_DEVICES_CMD, 0, list_devices}, - -- {DM_DEV_CREATE_CMD, IOCTL_FLAGS_NO_PARAMS, dev_create}, -- {DM_DEV_REMOVE_CMD, IOCTL_FLAGS_NO_PARAMS, dev_remove}, -- {DM_DEV_RENAME_CMD, 0, dev_rename}, -+ {DM_DEV_CREATE_CMD, IOCTL_FLAGS_NO_PARAMS | IOCTL_FLAGS_ISSUE_GLOBAL_EVENT, dev_create}, -+ {DM_DEV_REMOVE_CMD, IOCTL_FLAGS_NO_PARAMS | IOCTL_FLAGS_ISSUE_GLOBAL_EVENT, dev_remove}, -+ {DM_DEV_RENAME_CMD, IOCTL_FLAGS_ISSUE_GLOBAL_EVENT, dev_rename}, - {DM_DEV_SUSPEND_CMD, IOCTL_FLAGS_NO_PARAMS, dev_suspend}, - {DM_DEV_STATUS_CMD, IOCTL_FLAGS_NO_PARAMS, dev_status}, - {DM_DEV_WAIT_CMD, 0, dev_wait}, -@@ -1869,6 +1877,9 @@ static int ctl_ioctl(struct file *file, uint command, struct dm_ioctl __user *us - unlikely(ioctl_flags & IOCTL_FLAGS_NO_PARAMS)) - DMERR("ioctl %d tried to output some data but has IOCTL_FLAGS_NO_PARAMS set", cmd); - -+ if (!r && ioctl_flags & IOCTL_FLAGS_ISSUE_GLOBAL_EVENT) -+ dm_issue_global_event(); -+ - /* - * Copy the results back to userland. - */ -diff --git a/drivers/md/dm.c b/drivers/md/dm.c -index 6e54145969c5..4be85324f44d 100644 ---- a/drivers/md/dm.c -+++ b/drivers/md/dm.c -@@ -52,6 +52,12 @@ static struct workqueue_struct *deferred_remove_workqueue; - atomic_t dm_global_event_nr = ATOMIC_INIT(0); - DECLARE_WAIT_QUEUE_HEAD(dm_global_eventq); - -+void dm_issue_global_event(void) -+{ -+ atomic_inc(&dm_global_event_nr); -+ wake_up(&dm_global_eventq); -+} -+ - /* - * One of these is allocated per bio. - */ -@@ -1865,9 +1871,8 @@ static void event_callback(void *context) - dm_send_uevents(&uevents, &disk_to_dev(md->disk)->kobj); - - atomic_inc(&md->event_nr); -- atomic_inc(&dm_global_event_nr); - wake_up(&md->eventq); -- wake_up(&dm_global_eventq); -+ dm_issue_global_event(); - } - - /* -@@ -2283,6 +2288,7 @@ struct dm_table *dm_swap_table(struct mapped_device *md, struct dm_table *table) - } - - map = __bind(md, table, &limits); -+ dm_issue_global_event(); - - out: - mutex_unlock(&md->suspend_lock); -diff --git a/include/uapi/linux/dm-ioctl.h b/include/uapi/linux/dm-ioctl.h -index 412c06a624c8..ccaea525340b 100644 ---- a/include/uapi/linux/dm-ioctl.h -+++ b/include/uapi/linux/dm-ioctl.h -@@ -269,9 +269,9 @@ enum { - #define DM_DEV_SET_GEOMETRY _IOWR(DM_IOCTL, DM_DEV_SET_GEOMETRY_CMD, struct dm_ioctl) - - #define DM_VERSION_MAJOR 4 --#define DM_VERSION_MINOR 36 -+#define DM_VERSION_MINOR 37 - #define DM_VERSION_PATCHLEVEL 0 --#define DM_VERSION_EXTRA "-ioctl (2017-06-09)" -+#define DM_VERSION_EXTRA "-ioctl (2017-09-20)" - - /* Status bits */ - #define DM_READONLY_FLAG (1 << 0) /* In/Out */ diff --git a/queue-4.9/intel_th-pci-add-cedar-fork-pch-support.patch b/queue-4.9/intel_th-pci-add-cedar-fork-pch-support.patch deleted file mode 100644 index 0d1605c7605..00000000000 --- a/queue-4.9/intel_th-pci-add-cedar-fork-pch-support.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 920ce7c33db25cf4acb4ade3ae8c93bd23dfd730 Mon Sep 17 00:00:00 2001 -From: Alexander Shishkin -Date: Tue, 19 Sep 2017 18:47:41 +0300 -Subject: intel_th: pci: Add Cedar Fork PCH support - -From: Alexander Shishkin - -commit 920ce7c33db25cf4acb4ade3ae8c93bd23dfd730 upstream. - -This adds Intel(R) Trace Hub PCI ID for Cedar Fork PCH. - -Signed-off-by: Alexander Shishkin -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/hwtracing/intel_th/pci.c | 5 +++++ - 1 file changed, 5 insertions(+) - ---- a/drivers/hwtracing/intel_th/pci.c -+++ b/drivers/hwtracing/intel_th/pci.c -@@ -95,6 +95,11 @@ static const struct pci_device_id intel_ - PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x9da6), - .driver_data = (kernel_ulong_t)0, - }, -+ { -+ /* Cedar Fork PCH */ -+ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x18e1), -+ .driver_data = (kernel_ulong_t)&intel_th_2x, -+ }, - { 0 }, - }; - diff --git a/queue-4.9/intel_th-pci-add-lewisburg-pch-support.patch b/queue-4.9/intel_th-pci-add-lewisburg-pch-support.patch deleted file mode 100644 index 29c4cac1c9a..00000000000 --- a/queue-4.9/intel_th-pci-add-lewisburg-pch-support.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 24600840c74112ad04a9ddd99d7d7f731dcaa1cb Mon Sep 17 00:00:00 2001 -From: Alexander Shishkin -Date: Tue, 19 Sep 2017 18:47:42 +0300 -Subject: intel_th: pci: Add Lewisburg PCH support - -From: Alexander Shishkin - -commit 24600840c74112ad04a9ddd99d7d7f731dcaa1cb upstream. - -This adds Intel(R) Trace Hub PCI ID for Lewisburg PCH. - -Signed-off-by: Alexander Shishkin -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/hwtracing/intel_th/pci.c | 5 +++++ - 1 file changed, 5 insertions(+) - ---- a/drivers/hwtracing/intel_th/pci.c -+++ b/drivers/hwtracing/intel_th/pci.c -@@ -96,6 +96,11 @@ static const struct pci_device_id intel_ - .driver_data = (kernel_ulong_t)0, - }, - { -+ /* Lewisburg PCH */ -+ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xa1a6), -+ .driver_data = (kernel_ulong_t)0, -+ }, -+ { - /* Cedar Fork PCH */ - PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x18e1), - .driver_data = (kernel_ulong_t)&intel_th_2x, diff --git a/queue-4.9/series b/queue-4.9/series index 6e693f9b57c..e4301ae579d 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -78,8 +78,6 @@ socket-bpf-fix-possible-use-after-free.patch powerpc-64s-use-emergency-stack-for-kernel-tm-bad-thing-program-checks.patch powerpc-tm-fix-illegal-tm-state-in-signal-handler.patch percpu-make-this_cpu_generic_read-atomic-w.r.t.-interrupts.patch -intel_th-pci-add-cedar-fork-pch-support.patch -intel_th-pci-add-lewisburg-pch-support.patch driver-core-platform-don-t-read-past-the-end-of-driver_override-buffer.patch drivers-hv-fcopy-restore-correct-transfer-length.patch stm-class-fix-a-use-after-free.patch @@ -93,4 +91,3 @@ netlink-fix-nla_put_-u8-u16-u32-for-kasan.patch iwlwifi-mvm-use-iwl_hcmd_nocopy-for-mcast_filter_cmd.patch iwlwifi-add-workaround-to-disable-wide-channels-in-5ghz.patch scsi-sd-do-not-override-max_sectors_kb-sysfs-setting.patch -dm-ioctl-fix-alignment-of-event-number-in-the-device-list.patch