diff --git a/kernel.spec b/kernel.spec index cc89f0686..4252e2241 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 2 +%define stable_update 3 # Is it a -stable RC? %define stable_rc 0 # Set rpm version accordingly @@ -751,9 +751,6 @@ Patch25067: ACPICA-Tables-Fix-bad-pointer-issue-in-acpi_tb_parse_root_table.patc #rhbz 696821 Patch25068: fanotify-fix-EOVERFLOW-on-64-bit.patch -#CVE-2014-3122 rhbz 1093076 1093084 -Patch25069: mm-try_to_unmap_cluster-should-lock_page-before-mloc.patch - #rhbz 983342 1093120 Patch25070: 0001-acpi-video-Add-4-new-models-to-the-use_native_backli.patch @@ -1486,9 +1483,6 @@ ApplyPatch ACPICA-Tables-Fix-bad-pointer-issue-in-acpi_tb_parse_root_table.patch #rhbz 696821 ApplyPatch fanotify-fix-EOVERFLOW-on-64-bit.patch -#CVE-2014-3122 rhbz 1093076 1093084 -ApplyPatch mm-try_to_unmap_cluster-should-lock_page-before-mloc.patch - #rhbz 983342 1093120 ApplyPatch 0001-acpi-video-Add-4-new-models-to-the-use_native_backli.patch @@ -2328,6 +2322,9 @@ fi # ||----w | # || || %changelog +* Tue May 06 2014 Justin M. Forbes 3.14.3-200 +- Linux v3.14.3 + * Tue May 06 2014 Hans de Goede - Add a patch to fix the Synaptics Touch Pad V 103S found on some keyboard docks for win8 tablets diff --git a/mm-try_to_unmap_cluster-should-lock_page-before-mloc.patch b/mm-try_to_unmap_cluster-should-lock_page-before-mloc.patch deleted file mode 100644 index 60804192a..000000000 --- a/mm-try_to_unmap_cluster-should-lock_page-before-mloc.patch +++ /dev/null @@ -1,95 +0,0 @@ -Bugzilla: 1093084 -Upstream-status: 3.15 and stable CC'd - -From 57e68e9cd65b4b8eb4045a1e0d0746458502554c Mon Sep 17 00:00:00 2001 -From: Vlastimil Babka -Date: Mon, 7 Apr 2014 15:37:50 -0700 -Subject: [PATCH] mm: try_to_unmap_cluster() should lock_page() before mlocking - -A BUG_ON(!PageLocked) was triggered in mlock_vma_page() by Sasha Levin -fuzzing with trinity. The call site try_to_unmap_cluster() does not lock -the pages other than its check_page parameter (which is already locked). - -The BUG_ON in mlock_vma_page() is not documented and its purpose is -somewhat unclear, but apparently it serializes against page migration, -which could otherwise fail to transfer the PG_mlocked flag. This would -not be fatal, as the page would be eventually encountered again, but -NR_MLOCK accounting would become distorted nevertheless. This patch adds -a comment to the BUG_ON in mlock_vma_page() and munlock_vma_page() to that -effect. - -The call site try_to_unmap_cluster() is fixed so that for page != -check_page, trylock_page() is attempted (to avoid possible deadlocks as we -already have check_page locked) and mlock_vma_page() is performed only -upon success. If the page lock cannot be obtained, the page is left -without PG_mlocked, which is again not a problem in the whole unevictable -memory design. - -Signed-off-by: Vlastimil Babka -Signed-off-by: Bob Liu -Reported-by: Sasha Levin -Cc: Wanpeng Li -Cc: Michel Lespinasse -Cc: KOSAKI Motohiro -Acked-by: Rik van Riel -Cc: David Rientjes -Cc: Mel Gorman -Cc: Hugh Dickins -Cc: Joonsoo Kim -Cc: -Signed-off-by: Andrew Morton -Signed-off-by: Linus Torvalds ---- - mm/mlock.c | 2 ++ - mm/rmap.c | 14 ++++++++++++-- - 2 files changed, 14 insertions(+), 2 deletions(-) - -diff --git a/mm/mlock.c b/mm/mlock.c -index 4e1a68162285..b1eb53634005 100644 ---- a/mm/mlock.c -+++ b/mm/mlock.c -@@ -79,6 +79,7 @@ void clear_page_mlock(struct page *page) - */ - void mlock_vma_page(struct page *page) - { -+ /* Serialize with page migration */ - BUG_ON(!PageLocked(page)); - - if (!TestSetPageMlocked(page)) { -@@ -174,6 +175,7 @@ unsigned int munlock_vma_page(struct page *page) - unsigned int nr_pages; - struct zone *zone = page_zone(page); - -+ /* For try_to_munlock() and to serialize with page migration */ - BUG_ON(!PageLocked(page)); - - /* -diff --git a/mm/rmap.c b/mm/rmap.c -index 11cf322f8133..9c3e77396d1a 100644 ---- a/mm/rmap.c -+++ b/mm/rmap.c -@@ -1332,9 +1332,19 @@ static int try_to_unmap_cluster(unsigned long cursor, unsigned int *mapcount, - BUG_ON(!page || PageAnon(page)); - - if (locked_vma) { -- mlock_vma_page(page); /* no-op if already mlocked */ -- if (page == check_page) -+ if (page == check_page) { -+ /* we know we have check_page locked */ -+ mlock_vma_page(page); - ret = SWAP_MLOCK; -+ } else if (trylock_page(page)) { -+ /* -+ * If we can lock the page, perform mlock. -+ * Otherwise leave the page alone, it will be -+ * eventually encountered again later. -+ */ -+ mlock_vma_page(page); -+ unlock_page(page); -+ } - continue; /* don't unmap */ - } - --- -1.9.0 - diff --git a/sources b/sources index 25a5295b5..766509143 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ b621207b3f6ecbb67db18b13258f8ea8 linux-3.14.tar.xz -f2239bf772d1b6e1c26cb03f6e056959 patch-3.14.2.xz +92a784cdb150c798e122ac080dc0f455 patch-3.14.3.xz