diff --git a/0001-acpi-video-Add-use_native_backlight-quirks-for-Think.patch b/0001-acpi-video-Add-use_native_backlight-quirks-for-Think.patch deleted file mode 100644 index 80e722217..000000000 --- a/0001-acpi-video-Add-use_native_backlight-quirks-for-Think.patch +++ /dev/null @@ -1,76 +0,0 @@ -From fdf69c4a4cfbc24694f58014e536ea5110fff9c1 Mon Sep 17 00:00:00 2001 -From: Hans de Goede -Date: Mon, 5 May 2014 10:15:53 +0200 -Subject: [PATCH] acpi-video: Add use_native_backlight quirks for ThinkPad - T430, T530 and Acer Aspire 5742G - -ThinkPad T430: extend the T430s entry to also cover the T430 (note we also -have another entry for T430's with a different DMI_PRODUCT_VERSION). - -Reported-and-tested-by: edm -Buglink: https://bugzilla.kernel.org/show_bug.cgi?id=51231 - -Thinkpad T530 -Reported-and-tested-by: Balint Szigeti -Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=1089545 - -Acer Aspire 5742G -Reported-and-tested-by: AnAkkk -Buglink: https://bugzilla.kernel.org/show_bug.cgi?id=35622 - -Cc: stable@vger.kernel.org -Signed-off-by: Hans de Goede ---- - drivers/acpi/video.c | 20 ++++++++++++++++++-- - 1 file changed, 18 insertions(+), 2 deletions(-) - -diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c -index 48146fc..4d14b27 100644 ---- a/drivers/acpi/video.c -+++ b/drivers/acpi/video.c -@@ -457,10 +457,10 @@ static struct dmi_system_id video_dmi_table[] __initdata = { - }, - { - .callback = video_set_use_native_backlight, -- .ident = "ThinkPad T430s", -+ .ident = "ThinkPad T430 and T430s", - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), -- DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T430s"), -+ DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T430"), - }, - }, - { -@@ -472,6 +472,14 @@ static struct dmi_system_id video_dmi_table[] __initdata = { - }, - }, - { -+ .callback = video_set_use_native_backlight, -+ .ident = "ThinkPad T530", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), -+ DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T530"), -+ }, -+ }, -+ { - .callback = video_set_use_native_backlight, - .ident = "ThinkPad X1 Carbon", - .matches = { -@@ -521,6 +529,14 @@ static struct dmi_system_id video_dmi_table[] __initdata = { - }, - { - .callback = video_set_use_native_backlight, -+ .ident = "Acer Aspire 5742G", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "Acer"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5742G"), -+ }, -+ }, -+ { -+ .callback = video_set_use_native_backlight, - .ident = "Acer Aspire V5-171", - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "Acer"), --- -1.9.0 - diff --git a/0001-synaptics-Add-min-max-quirk-for-the-ThinkPad-W540.patch b/0001-synaptics-Add-min-max-quirk-for-the-ThinkPad-W540.patch deleted file mode 100644 index 9ccc271fc..000000000 --- a/0001-synaptics-Add-min-max-quirk-for-the-ThinkPad-W540.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 8351510e7a3c1b35adf046d8c473be2f5ad617c7 Mon Sep 17 00:00:00 2001 -From: Hans de Goede -Date: Wed, 14 May 2014 12:40:08 +0200 -Subject: [PATCH] synaptics: Add min/max quirk for the ThinkPad W540 - -https://bugzilla.redhat.com/show_bug.cgi?id=1096436 - -Tested-and-reported-by: ajayr@bigfoot.com -Signed-off-by: Hans de Goede ---- - drivers/input/mouse/synaptics.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c -index d68d33f..d4c05b1 100644 ---- a/drivers/input/mouse/synaptics.c -+++ b/drivers/input/mouse/synaptics.c -@@ -1614,6 +1614,14 @@ static const struct dmi_system_id min_max_dmi_table[] __initconst = { - .driver_data = (int []){1024, 5112, 2024, 4832}, - }, - { -+ /* Lenovo ThinkPad W540 */ -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), -+ DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad W540"), -+ }, -+ .driver_data = (int []){1024, 5112, 2024, 4832}, -+ }, -+ { - /* Lenovo Yoga S1 */ - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), --- -1.9.0 - diff --git a/0002-elantech-Fix-elantech-on-Gigabyte-U2442.patch b/0002-elantech-Fix-elantech-on-Gigabyte-U2442.patch deleted file mode 100644 index 4d4267781..000000000 --- a/0002-elantech-Fix-elantech-on-Gigabyte-U2442.patch +++ /dev/null @@ -1,124 +0,0 @@ -From 219bc087cb6043d919575a86aa37912919e99dde Mon Sep 17 00:00:00 2001 -From: Hans de Goede -Date: Fri, 18 Apr 2014 10:50:57 +0200 -Subject: [PATCH 2/4] elantech: Fix elantech on Gigabyte U2442 - -The hw_version 3 elantech touchpad on the Gigabyte U2442 does not accept -0x0b as initialization value for r10, this stand-alone version of the driver: -http://planet76.com/drivers/elantech/psmouse-elantech-v6.tar.bz2 - -Uses 0x03 which does work, so this means not setting bit 3 of r10 which sets: -"Enable Real H/W Resolution In Absolute mode" - -Which will result in half the x and y resolution we get with that bit set, -so simply not setting it everywhere is not a solution. We've been unable -to find a way to identifty touchpads where setting the bit will fail, so this -patch uses a dmi based blacklist for this. - -https://bugzilla.kernel.org/show_bug.cgi?id=61151 - -Cc: stable@vger.kernel.org -Reported-by: Philipp Wolfer -Tested-by: Philipp Wolfer -Signed-off-by: Hans de Goede - --- - -Changes in v2: Add cc: stable. ---- - Documentation/input/elantech.txt | 5 ++++- - drivers/input/mouse/elantech.c | 26 +++++++++++++++++++++++++- - drivers/input/mouse/elantech.h | 1 + - 3 files changed, 30 insertions(+), 2 deletions(-) - -diff --git a/Documentation/input/elantech.txt b/Documentation/input/elantech.txt -index 5602eb7..e1ae127 100644 ---- a/Documentation/input/elantech.txt -+++ b/Documentation/input/elantech.txt -@@ -504,9 +504,12 @@ byte 5: - * reg_10 - - bit 7 6 5 4 3 2 1 0 -- 0 0 0 0 0 0 0 A -+ 0 0 0 0 R F T A - - A: 1 = enable absolute tracking -+ T: 1 = enable two finger mode auto correct -+ F: 1 = disable ABS Position Filter -+ R: 1 = enable real hardware resolution - - 6.2 Native absolute mode 6 byte packet format - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c -index 088d354..b96e978 100644 ---- a/drivers/input/mouse/elantech.c -+++ b/drivers/input/mouse/elantech.c -@@ -11,6 +11,7 @@ - */ - - #include -+#include - #include - #include - #include -@@ -831,7 +832,11 @@ static int elantech_set_absolute_mode(struct psmouse *psmouse) - break; - - case 3: -- etd->reg_10 = 0x0b; -+ if (etd->set_hw_resolution) -+ etd->reg_10 = 0x0b; -+ else -+ etd->reg_10 = 0x03; -+ - if (elantech_write_reg(psmouse, 0x10, etd->reg_10)) - rc = -1; - -@@ -1331,6 +1336,22 @@ static int elantech_reconnect(struct psmouse *psmouse) - } - - /* -+ * Some hw_version 3 models go into error state when we try to set bit 3 of r10 -+ */ -+static const struct dmi_system_id no_hw_res_dmi_table[] = { -+#if defined(CONFIG_DMI) && defined(CONFIG_X86) -+ { -+ /* Gigabyte U2442 */ -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "GIGABYTE"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "U2442"), -+ }, -+ }, -+#endif -+ { } -+}; -+ -+/* - * determine hardware version and set some properties according to it. - */ - static int elantech_set_properties(struct elantech_data *etd) -@@ -1390,6 +1411,9 @@ static int elantech_set_properties(struct elantech_data *etd) - */ - etd->crc_enabled = ((etd->fw_version & 0x4000) == 0x4000); - -+ /* Enable real hardware resolution on hw_version 3 ? */ -+ etd->set_hw_resolution = !dmi_check_system(no_hw_res_dmi_table); -+ - return 0; - } - -diff --git a/drivers/input/mouse/elantech.h b/drivers/input/mouse/elantech.h -index 036a04a..9e0e2a1 100644 ---- a/drivers/input/mouse/elantech.h -+++ b/drivers/input/mouse/elantech.h -@@ -130,6 +130,7 @@ struct elantech_data { - bool jumpy_cursor; - bool reports_pressure; - bool crc_enabled; -+ bool set_hw_resolution; - unsigned char hw_version; - unsigned int fw_version; - unsigned int single_finger_reports; --- -1.9.0 - diff --git a/0004-acpi-blacklist-Add-dmi_enable_osi_linux-quirk-for-As.patch b/0004-acpi-blacklist-Add-dmi_enable_osi_linux-quirk-for-As.patch deleted file mode 100644 index c2d5e3ecc..000000000 --- a/0004-acpi-blacklist-Add-dmi_enable_osi_linux-quirk-for-As.patch +++ /dev/null @@ -1,49 +0,0 @@ -From b3550bb61f5bc2fab7ecbe2ab70a505c656db133 Mon Sep 17 00:00:00 2001 -From: Hans de Goede -Date: Mon, 5 May 2014 10:32:22 +0200 -Subject: [PATCH 4/4] acpi-blacklist: Add dmi_enable_osi_linux quirk for Asus - EEE PC 1015PX - -Without this this EEE PC exports a non working WMI interface, with this it -exports a working "good old" eeepc_laptop interface, fixing brightness control -not working as well as rfkill being stuck in a permanent wireless blocked -state. - -This is not an ideal way to fix this, but various attempts to fix this -otherwise have failed, see: -https://bugzilla.redhat.com/show_bug.cgi?id=1067181 - -Cc: stable@vger.kernel.org -Reported-and-tested-by: lou.cardone@gmail.com -Signed-off-by: Hans de Goede ---- - drivers/acpi/blacklist.c | 13 +++++++++++++ - 1 file changed, 13 insertions(+) - -diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c -index afec452..96fa4acd 100644 ---- a/drivers/acpi/blacklist.c -+++ b/drivers/acpi/blacklist.c -@@ -374,6 +374,19 @@ static struct dmi_system_id acpi_osi_dmi_table[] __initdata = { - DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T500"), - }, - }, -+ /* -+ * Without this this EEEpc exports a non working WMI interface, with -+ * this it exports a working "good old" eeepc_laptop interface, fixing -+ * both brightness control, and rfkill not working. -+ */ -+ { -+ .callback = dmi_enable_osi_linux, -+ .ident = "Asus EEE PC 1015PX", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer INC."), -+ DMI_MATCH(DMI_PRODUCT_NAME, "1015PX"), -+ }, -+ }, - {} - }; - --- -1.9.0 - diff --git a/ACPICA-Tables-Fix-bad-pointer-issue-in-acpi_tb_parse_root_table.patch b/ACPICA-Tables-Fix-bad-pointer-issue-in-acpi_tb_parse_root_table.patch deleted file mode 100644 index 73dfc5aef..000000000 --- a/ACPICA-Tables-Fix-bad-pointer-issue-in-acpi_tb_parse_root_table.patch +++ /dev/null @@ -1,67 +0,0 @@ -Bugzilla: 1090746 -Upstream-status: Queued for 3.15 and CC'd to stable - -From 2bb09843fc720389082ce7834b2716254bdf6c2d Mon Sep 17 00:00:00 2001 -Message-Id: <2bb09843fc720389082ce7834b2716254bdf6c2d.1397794898.git.lv.zheng@intel.com> -From: Lv Zheng -Date: Fri, 18 Apr 2014 12:21:34 +0800 -Subject: [PATCH] ACPICA: Tables: Fix a bad pointer issue in - acpi_tb_parse_root_table(). - -The following is a linuxizing generation of the ACPICA commit to back ports -Linux XSDT validation mechanism to ACPICA: - Commit: 671cc68dc61f029d44b43a681356078e02d8dab8 - Subject: ACPICA: Back port and refine validation of the XSDT root table. -It triggers a regression that a pointer is still used after unmapping. - -This patch fixes this issue. Lv Zheng. - -Buglink: https://bugzilla.kernel.org/show_bug.cgi?id=73911 -Buglink: https://bugs.archlinux.org/task/39811 -Signed-off-by: Lv Zheng -Reported-and-tested-by: Bruce Chiarelli -Reported-and-tested-by: Spyros Stathopoulos -Cc: # 3.14.x: 671cc68: ACPICA: Back port and refine validation of the XSDT root table. ---- - drivers/acpi/acpica/tbutils.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/drivers/acpi/acpica/tbutils.c b/drivers/acpi/acpica/tbutils.c -index 6412d3c..7285871 100644 ---- a/drivers/acpi/acpica/tbutils.c -+++ b/drivers/acpi/acpica/tbutils.c -@@ -461,6 +461,7 @@ acpi_status __init acpi_tb_parse_root_table(acpi_physical_address rsdp_address) - u32 table_count; - struct acpi_table_header *table; - acpi_physical_address address; -+ acpi_physical_address rsdt_address; - u32 length; - u8 *table_entry; - acpi_status status; -@@ -488,11 +489,13 @@ acpi_status __init acpi_tb_parse_root_table(acpi_physical_address rsdp_address) - * as per the ACPI specification. - */ - address = (acpi_physical_address) rsdp->xsdt_physical_address; -+ rsdt_address = (acpi_physical_address) rsdp->rsdt_physical_address; - table_entry_size = ACPI_XSDT_ENTRY_SIZE; - } else { - /* Root table is an RSDT (32-bit physical addresses) */ - - address = (acpi_physical_address) rsdp->rsdt_physical_address; -+ rsdt_address = address; - table_entry_size = ACPI_RSDT_ENTRY_SIZE; - } - -@@ -515,8 +518,7 @@ acpi_status __init acpi_tb_parse_root_table(acpi_physical_address rsdp_address) - - /* Fall back to the RSDT */ - -- address = -- (acpi_physical_address) rsdp->rsdt_physical_address; -+ address = rsdt_address; - table_entry_size = ACPI_RSDT_ENTRY_SIZE; - } - } --- -1.7.10 - diff --git a/futex-add-another-early-deadlock-detection-check.patch b/futex-add-another-early-deadlock-detection-check.patch deleted file mode 100644 index afc0acfce..000000000 --- a/futex-add-another-early-deadlock-detection-check.patch +++ /dev/null @@ -1,166 +0,0 @@ -Bugzilla: 1105609 -Upstream-status: 3.15 and queued for 3.14.6 - -From 866293ee54227584ffcb4a42f69c1f365974ba7f Mon Sep 17 00:00:00 2001 -From: Thomas Gleixner -Date: Mon, 12 May 2014 20:45:34 +0000 -Subject: futex: Add another early deadlock detection check - -From: Thomas Gleixner - -commit 866293ee54227584ffcb4a42f69c1f365974ba7f upstream. - -Dave Jones trinity syscall fuzzer exposed an issue in the deadlock -detection code of rtmutex: - http://lkml.kernel.org/r/20140429151655.GA14277@redhat.com - -That underlying issue has been fixed with a patch to the rtmutex code, -but the futex code must not call into rtmutex in that case because - - it can detect that issue early - - it avoids a different and more complex fixup for backing out - -If the user space variable got manipulated to 0x80000000 which means -no lock holder, but the waiters bit set and an active pi_state in the -kernel is found we can figure out the recursive locking issue by -looking at the pi_state owner. If that is the current task, then we -can safely return -EDEADLK. - -The check should have been added in commit 59fa62451 (futex: Handle -futex_pi OWNER_DIED take over correctly) already, but I did not see -the above issue caused by user space manipulation back then. - -Signed-off-by: Thomas Gleixner -Cc: Dave Jones -Cc: Linus Torvalds -Cc: Peter Zijlstra -Cc: Darren Hart -Cc: Davidlohr Bueso -Cc: Steven Rostedt -Cc: Clark Williams -Cc: Paul McKenney -Cc: Lai Jiangshan -Cc: Roland McGrath -Cc: Carlos ODonell -Cc: Jakub Jelinek -Cc: Michael Kerrisk -Cc: Sebastian Andrzej Siewior -Link: http://lkml.kernel.org/r/20140512201701.097349971@linutronix.de -Signed-off-by: Thomas Gleixner -Signed-off-by: Greg Kroah-Hartman - ---- - kernel/futex.c | 47 ++++++++++++++++++++++++++++++++++------------- - 1 file changed, 34 insertions(+), 13 deletions(-) - ---- a/kernel/futex.c -+++ b/kernel/futex.c -@@ -731,7 +731,8 @@ void exit_pi_state_list(struct task_stru - - static int - lookup_pi_state(u32 uval, struct futex_hash_bucket *hb, -- union futex_key *key, struct futex_pi_state **ps) -+ union futex_key *key, struct futex_pi_state **ps, -+ struct task_struct *task) - { - struct futex_pi_state *pi_state = NULL; - struct futex_q *this, *next; -@@ -772,6 +773,16 @@ lookup_pi_state(u32 uval, struct futex_h - return -EINVAL; - } - -+ /* -+ * Protect against a corrupted uval. If uval -+ * is 0x80000000 then pid is 0 and the waiter -+ * bit is set. So the deadlock check in the -+ * calling code has failed and we did not fall -+ * into the check above due to !pid. -+ */ -+ if (task && pi_state->owner == task) -+ return -EDEADLK; -+ - atomic_inc(&pi_state->refcount); - *ps = pi_state; - -@@ -921,7 +932,7 @@ retry: - * We dont have the lock. Look up the PI state (or create it if - * we are the first waiter): - */ -- ret = lookup_pi_state(uval, hb, key, ps); -+ ret = lookup_pi_state(uval, hb, key, ps, task); - - if (unlikely(ret)) { - switch (ret) { -@@ -1333,7 +1344,7 @@ void requeue_pi_wake_futex(struct futex_ - * - * Return: - * 0 - failed to acquire the lock atomically; -- * 1 - acquired the lock; -+ * >0 - acquired the lock, return value is vpid of the top_waiter - * <0 - error - */ - static int futex_proxy_trylock_atomic(u32 __user *pifutex, -@@ -1344,7 +1355,7 @@ static int futex_proxy_trylock_atomic(u3 - { - struct futex_q *top_waiter = NULL; - u32 curval; -- int ret; -+ int ret, vpid; - - if (get_futex_value_locked(&curval, pifutex)) - return -EFAULT; -@@ -1372,11 +1383,13 @@ static int futex_proxy_trylock_atomic(u3 - * the contended case or if set_waiters is 1. The pi_state is returned - * in ps in contended cases. - */ -+ vpid = task_pid_vnr(top_waiter->task); - ret = futex_lock_pi_atomic(pifutex, hb2, key2, ps, top_waiter->task, - set_waiters); -- if (ret == 1) -+ if (ret == 1) { - requeue_pi_wake_futex(top_waiter, key2, hb2); -- -+ return vpid; -+ } - return ret; - } - -@@ -1407,7 +1420,6 @@ static int futex_requeue(u32 __user *uad - struct futex_pi_state *pi_state = NULL; - struct futex_hash_bucket *hb1, *hb2; - struct futex_q *this, *next; -- u32 curval2; - - if (requeue_pi) { - /* -@@ -1495,16 +1507,25 @@ retry_private: - * At this point the top_waiter has either taken uaddr2 or is - * waiting on it. If the former, then the pi_state will not - * exist yet, look it up one more time to ensure we have a -- * reference to it. -+ * reference to it. If the lock was taken, ret contains the -+ * vpid of the top waiter task. - */ -- if (ret == 1) { -+ if (ret > 0) { - WARN_ON(pi_state); - drop_count++; - task_count++; -- ret = get_futex_value_locked(&curval2, uaddr2); -- if (!ret) -- ret = lookup_pi_state(curval2, hb2, &key2, -- &pi_state); -+ /* -+ * If we acquired the lock, then the user -+ * space value of uaddr2 should be vpid. It -+ * cannot be changed by the top waiter as it -+ * is blocked on hb2 lock if it tries to do -+ * so. If something fiddled with it behind our -+ * back the pi state lookup might unearth -+ * it. So we rather use the known value than -+ * rereading and handing potential crap to -+ * lookup_pi_state. -+ */ -+ ret = lookup_pi_state(ret, hb2, &key2, &pi_state, NULL); - } - - switch (ret) { diff --git a/kernel.spec b/kernel.spec index b985261e1..5f7e530d4 100644 --- a/kernel.spec +++ b/kernel.spec @@ -74,7 +74,7 @@ Summary: The Linux kernel %if 0%{?released_kernel} # Do we have a -stable update to apply? -%define stable_update 5 +%define stable_update 6 # Is it a -stable RC? %define stable_rc 0 # Set rpm version accordingly @@ -723,9 +723,6 @@ Patch25072: HID-rmi-do-not-fetch-more-than-16-bytes-in-a-query.patch #rhbz 1013466 Patch25065: selinux-put-the-mmap-DAC-controls-before-the-MAC-controls.patch -#rhbz 1090746 -Patch25067: ACPICA-Tables-Fix-bad-pointer-issue-in-acpi_tb_parse_root_table.patch - #rhbz 696821 Patch25068: fanotify-fix-EOVERFLOW-on-64-bit.patch @@ -735,18 +732,9 @@ Patch25070: 0001-acpi-video-Add-4-new-models-to-the-use_native_backli.patch #rhbz 1060327 Patch25071: drm-fix-qxl-mode-flags-backport.patch -#rhbz 1089545 -Patch25074: 0001-acpi-video-Add-use_native_backlight-quirks-for-Think.patch - -#misc input fixes -Patch25078: 0002-elantech-Fix-elantech-on-Gigabyte-U2442.patch - #rhbz 861573 Patch25079: 0003-samsung-laptop-Add-broken-acpi-video-quirk-for-NC210.patch -#rhbz 1067181 -Patch25080: 0004-acpi-blacklist-Add-dmi_enable_osi_linux-quirk-for-As.patch - #CVE-2014-0181 rhbz 1094270 1094265 Patch25082: 1-5-netlink-Rename-netlink_capable-netlink_allowed.patch Patch25083: 2-5-net-Move-the-permission-check-in-sock_diag_put_filterinfo-to-packet_diag_dump.patch @@ -759,9 +747,6 @@ Patch25094: netlink-Only-check-file-credentials-for-implicit-des.patch #rhbz 1082266 Patch25087: jme-fix-dma-unmap-error.patch -#rhbz 1096436 -Patch25091: 0001-synaptics-Add-min-max-quirk-for-the-ThinkPad-W540.patch - #rhbz 1051668 Patch25092: Input-elantech-add-support-for-newer-elantech-touchpads.patch @@ -774,14 +759,6 @@ Patch25095: team-fix-mtu-setting.patch # CVE-2014-3940 rhbz 1104097 1105042 Patch25096: mm-add-pte_present-check-on-existing-hugetlb_entry-callbacks.patch -# CVE-2014-3153 rhbz 1103626 1105609 -Patch25097: futex-add-another-early-deadlock-detection-check.patch -Patch25098: futex-prevent-attaching-to-kernel-threads.patch -Patch25099: futex-prevent-requeue-pi-on-same-futex.patch-futex-forbid-uaddr-uaddr2-in-futex_requeue-...-requeue_pi-1.patch -Patch25100: futex-validate-atomic-acquisition-in-futex_lock_pi_atomic.patch -Patch25101: futex-always-cleanup-owner-tid-in-unlock_pi.patch -Patch25102: futex-make-lookup_pi_state-more-robust.patch - # END OF PATCH DEFINITIONS %endif @@ -1457,9 +1434,6 @@ ApplyPatch mm-page_alloc.c-change-mm-debug-routines-back-to-EXP.patch #rhbz 1013466 ApplyPatch selinux-put-the-mmap-DAC-controls-before-the-MAC-controls.patch -#rhbz 1090746 -ApplyPatch ACPICA-Tables-Fix-bad-pointer-issue-in-acpi_tb_parse_root_table.patch - #rhbz 696821 ApplyPatch fanotify-fix-EOVERFLOW-on-64-bit.patch @@ -1469,18 +1443,9 @@ ApplyPatch 0001-acpi-video-Add-4-new-models-to-the-use_native_backli.patch #rhbz 1060327 ApplyPatch drm-fix-qxl-mode-flags-backport.patch -#rhbz 1089545 -ApplyPatch 0001-acpi-video-Add-use_native_backlight-quirks-for-Think.patch - -#misc input fixes -ApplyPatch 0002-elantech-Fix-elantech-on-Gigabyte-U2442.patch - #rhbz 861573 ApplyPatch 0003-samsung-laptop-Add-broken-acpi-video-quirk-for-NC210.patch -#rhbz 1067181 -ApplyPatch 0004-acpi-blacklist-Add-dmi_enable_osi_linux-quirk-for-As.patch - #CVE-2014-0181 rhbz 1094270 1094265 ApplyPatch 1-5-netlink-Rename-netlink_capable-netlink_allowed.patch ApplyPatch 2-5-net-Move-the-permission-check-in-sock_diag_put_filterinfo-to-packet_diag_dump.patch @@ -1493,9 +1458,6 @@ ApplyPatch netlink-Only-check-file-credentials-for-implicit-des.patch #rhbz 1082266 ApplyPatch jme-fix-dma-unmap-error.patch -#rhbz 1096436 -ApplyPatch 0001-synaptics-Add-min-max-quirk-for-the-ThinkPad-W540.patch - #rhbz 1051668 ApplyPatch Input-elantech-add-support-for-newer-elantech-touchpads.patch @@ -1508,14 +1470,6 @@ ApplyPatch team-fix-mtu-setting.patch # CVE-2014-3940 rhbz 1104097 1105042 ApplyPatch mm-add-pte_present-check-on-existing-hugetlb_entry-callbacks.patch -# CVE-2014-3153 rhbz 1103626 1105609 -ApplyPatch futex-add-another-early-deadlock-detection-check.patch -ApplyPatch futex-prevent-attaching-to-kernel-threads.patch -ApplyPatch futex-prevent-requeue-pi-on-same-futex.patch-futex-forbid-uaddr-uaddr2-in-futex_requeue-...-requeue_pi-1.patch -ApplyPatch futex-validate-atomic-acquisition-in-futex_lock_pi_atomic.patch -ApplyPatch futex-always-cleanup-owner-tid-in-unlock_pi.patch -ApplyPatch futex-make-lookup_pi_state-more-robust.patch - # END OF PATCH APPLICATIONS %endif @@ -2327,6 +2281,9 @@ fi # ||----w | # || || %changelog +* Sat Jun 07 2014 Justin M. Forbes - 3.14.6-200 +- Linux v3.14.6 + * Fri Jun 06 2014 Josh Boyer - CVE-2014-3153 futex: pi futexes requeue issue (rhbz 1103626 1105609) - CVE-2014-3940 missing check during hugepage migration (rhbz 1104097 1105042) diff --git a/sources b/sources index 22e51661f..3c8575722 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ b621207b3f6ecbb67db18b13258f8ea8 linux-3.14.tar.xz -a56bf05cb9033097198f9269bbcff130 patch-3.14.5.xz +068b814830b45c232340db534bc06e04 patch-3.14.6.xz