CVE-2014-XXXX: mm: fix locking DoS issue (rhbz 1093084 1093076)
This commit is contained in:
parent
d7e828ec06
commit
b6f6082c49
|
@ -780,6 +780,9 @@ Patch25064: 0001-HID-rmi-do-not-handle-touchscreens-through-hid-rmi.patch
|
|||
#rhbz 1089689
|
||||
Patch25065: 0001-synaptics-Add-min-max-quirk-for-ThinkPad-Edge-E431.patch
|
||||
|
||||
#CVE-2014-XXXX rhbz 1093076 1093084
|
||||
Patch25069: mm-try_to_unmap_cluster-should-lock_page-before-mloc.patch
|
||||
|
||||
# END OF PATCH DEFINITIONS
|
||||
|
||||
%endif
|
||||
|
@ -1505,6 +1508,9 @@ ApplyPatch USB-serial-ftdi_sio-add-id-for-Brainboxes-serial-car.patch
|
|||
#rhbz 1089689
|
||||
ApplyPatch 0001-synaptics-Add-min-max-quirk-for-ThinkPad-Edge-E431.patch
|
||||
|
||||
#CVE-2014-XXXX rhbz 1093076 1093084
|
||||
ApplyPatch mm-try_to_unmap_cluster-should-lock_page-before-mloc.patch
|
||||
|
||||
# END OF PATCH APPLICATIONS
|
||||
|
||||
%endif
|
||||
|
@ -2318,6 +2324,7 @@ fi
|
|||
|
||||
%changelog
|
||||
* Wed Apr 30 2014 Josh Boyer <jwboyer@fedoraproject.org>
|
||||
- CVE-2014-XXXX: mm: fix locking DoS issue (rhbz 1093084 1093076)
|
||||
- Enable CONFIG_MEMORY_HOTPLUG (rhbz 1092948)
|
||||
|
||||
* Fri Apr 25 2014 Hans de Goede <hdegoede@redhat.com>
|
||||
|
|
|
@ -0,0 +1,95 @@
|
|||
Bugzilla: 1093084
|
||||
Upstream-status: 3.15 and stable CC'd
|
||||
|
||||
From 85cc8301cbedcf3049ce15de6f3c2b9e935d0d76 Mon Sep 17 00:00:00 2001
|
||||
From: Vlastimil Babka <vbabka@suse.cz>
|
||||
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 <vbabka@suse.cz>
|
||||
Signed-off-by: Bob Liu <bob.liu@oracle.com>
|
||||
Reported-by: Sasha Levin <sasha.levin@oracle.com>
|
||||
Cc: Wanpeng Li <liwanp@linux.vnet.ibm.com>
|
||||
Cc: Michel Lespinasse <walken@google.com>
|
||||
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
|
||||
Acked-by: Rik van Riel <riel@redhat.com>
|
||||
Cc: David Rientjes <rientjes@google.com>
|
||||
Cc: Mel Gorman <mgorman@suse.de>
|
||||
Cc: Hugh Dickins <hughd@google.com>
|
||||
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
|
||||
Cc: <stable@vger.kernel.org>
|
||||
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
|
||||
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
|
||||
---
|
||||
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 192e6eebe4f2..1b12dfad0794 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)) {
|
||||
@@ -153,6 +154,7 @@ unsigned int munlock_vma_page(struct page *page)
|
||||
{
|
||||
unsigned int nr_pages;
|
||||
|
||||
+ /* For try_to_munlock() and to serialize with page migration */
|
||||
BUG_ON(!PageLocked(page));
|
||||
|
||||
if (TestClearPageMlocked(page)) {
|
||||
diff --git a/mm/rmap.c b/mm/rmap.c
|
||||
index 068522d8502a..b99c74271fec 100644
|
||||
--- a/mm/rmap.c
|
||||
+++ b/mm/rmap.c
|
||||
@@ -1389,9 +1389,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
|
||||
|
Loading…
Reference in New Issue