lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Mon, 28 Apr 2014 02:11:22 +0100 From: Ben Hutchings <ben@...adent.org.uk> To: linux-kernel@...r.kernel.org, stable@...r.kernel.org CC: akpm@...ux-foundation.org, "Wanpeng Li" <liwanp@...ux.vnet.ibm.com>, "Bob Liu" <bob.liu@...cle.com>, "Sasha Levin" <sasha.levin@...cle.com>, "Vlastimil Babka" <vbabka@...e.cz>, "Mel Gorman" <mgorman@...e.de>, "Rik van Riel" <riel@...hat.com>, "Joonsoo Kim" <iamjoonsoo.kim@....com>, "Hugh Dickins" <hughd@...gle.com>, "Michel Lespinasse" <walken@...gle.com>, "Linus Torvalds" <torvalds@...ux-foundation.org>, "KOSAKI Motohiro" <kosaki.motohiro@...fujitsu.com>, "David Rientjes" <rientjes@...gle.com> Subject: [PATCH 3.2 80/94] mm: try_to_unmap_cluster() should lock_page() before mlocking 3.2.58-rc1 review patch. If anyone has any objections, please let me know. ------------------ From: Vlastimil Babka <vbabka@...e.cz> commit 57e68e9cd65b4b8eb4045a1e0d0746458502554c upstream. 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@...e.cz> Signed-off-by: Bob Liu <bob.liu@...cle.com> Reported-by: Sasha Levin <sasha.levin@...cle.com> Cc: Wanpeng Li <liwanp@...ux.vnet.ibm.com> Cc: Michel Lespinasse <walken@...gle.com> Cc: KOSAKI Motohiro <kosaki.motohiro@...fujitsu.com> Acked-by: Rik van Riel <riel@...hat.com> Cc: David Rientjes <rientjes@...gle.com> Cc: Mel Gorman <mgorman@...e.de> Cc: Hugh Dickins <hughd@...gle.com> Cc: Joonsoo Kim <iamjoonsoo.kim@....com> Signed-off-by: Andrew Morton <akpm@...ux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@...ux-foundation.org> [bwh: Backported to 3.2: adjust context] Signed-off-by: Ben Hutchings <ben@...adent.org.uk> --- mm/mlock.c | 2 ++ mm/rmap.c | 14 ++++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) --- a/mm/mlock.c +++ b/mm/mlock.c @@ -78,6 +78,7 @@ void __clear_page_mlock(struct page *pag */ void mlock_vma_page(struct page *page) { + /* Serialize with page migration */ BUG_ON(!PageLocked(page)); if (!TestSetPageMlocked(page)) { @@ -105,6 +106,7 @@ void mlock_vma_page(struct page *page) */ void munlock_vma_page(struct page *page) { + /* For try_to_munlock() and to serialize with page migration */ BUG_ON(!PageLocked(page)); if (TestClearPageMlocked(page)) { --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1385,9 +1385,19 @@ static int try_to_unmap_cluster(unsigned 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 */ } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists