linux-kernel - [PATCH] mm/thp: fix deadlock in collapse

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

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20191028221414.3685035-1-songliubraving@fb.com>
Date:   Mon, 28 Oct 2019 15:14:14 -0700
From:   Song Liu <songliubraving@...com>
To:     <linux-kernel@...r.kernel.org>, <linux-mm@...ck.org>,
        <akpm@...ux-foundation.org>
CC:     <matthew.wilcox@...cle.com>, <kernel-team@...com>,
        <william.kucharski@...cle.com>, <kirill.shutemov@...ux.intel.com>,
        Song Liu <songliubraving@...com>,
        Johannes Weiner <hannes@...xchg.org>,
        Hugh Dickins <hughd@...gle.com>
Subject: [PATCH] mm/thp: fix deadlock in collapse_file()

As syzbot reported, we cannot call filemap_flush() with the page locked.
Remove the filemap_flush() as it is not required. khugepaged would just
wait until the page is flushed naturally.

Reported-by: syzbot+efb9e48b9fbdc49bb34a@...kaller.appspotmail.com
Fixes: 9d840e58caa0 ("mmthp-recheck-each-page-before-collapsing-file-thp-v4")
Cc: Johannes Weiner <hannes@...xchg.org>
Cc: Kirill A. Shutemov <kirill.shutemov@...ux.intel.com>
Cc: Hugh Dickins <hughd@...gle.com>
Cc: William Kucharski <william.kucharski@...cle.com>
Cc: Andrew Morton <akpm@...ux-foundation.org>
Signed-off-by: Song Liu <songliubraving@...com>
---
 mm/khugepaged.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/mm/khugepaged.c b/mm/khugepaged.c
index cd480dce92c6..3ec5333ae94d 100644
--- a/mm/khugepaged.c
+++ b/mm/khugepaged.c
@@ -1640,16 +1640,8 @@ static void collapse_file(struct mm_struct *mm,
 			/*
 			 * khugepaged only works on read-only fd, so this
 			 * page is dirty because it hasn't been flushed
-			 * since first write. There won't be new dirty
-			 * pages.
-			 *
-			 * Trigger async flush here and hope the writeback
-			 * is done when khugepaged revisits this page.
-			 *
-			 * This is a one-off situation. We are not forcing
-			 * writeback in loop.
+			 * since first write.
 			 */
-			filemap_flush(mapping);
 			result = SCAN_FAIL;
 			goto out_unlock;
 		}
-- 
2.17.1