linux-kernel - [PATCH] Fix khugepaged's request size 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>] [thread-next>] [day] [month] [year] [list]

Message-ID: <159905616280.521200.12444250032673650063.stgit@warthog.procyon.org.uk>
Date:   Wed, 02 Sep 2020 15:16:02 +0100
From:   David Howells <dhowells@...hat.com>
To:     akpm@...ux-foundation.org
Cc:     Song Liu <songliubraving@...com>,
        "Matthew Wilcox (Oracle)" <willy@...radead.org>,
        dhowells@...hat.com, linux-mm@...ck.org,
        linux-kernel@...r.kernel.org
Subject: [PATCH] Fix khugepaged's request size in collapse_file()

collapse_file() in khugepaged passes PAGE_SIZE as the number of pages to be
read ahead to page_cache_sync_readahead().  It seems this was expressed as a
number of bytes rather than a number of pages.

Fix it to use the number of pages to the end of the window instead.

Fixes: 99cb0dbd47a1 ("mm,thp: add read-only THP support for (non-shmem) FS")
Signed-off-by: David Howells <dhowells@...hat.com>
Acked-by: Song Liu <songliubraving@...com>
Reviewed-by: Matthew Wilcox (Oracle) <willy@...radead.org>
---

 mm/khugepaged.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mm/khugepaged.c b/mm/khugepaged.c
index 6d199c353281..f2d243077b74 100644
--- a/mm/khugepaged.c
+++ b/mm/khugepaged.c
@@ -1706,7 +1706,7 @@ static void collapse_file(struct mm_struct *mm,
 				xas_unlock_irq(&xas);
 				page_cache_sync_readahead(mapping, &file->f_ra,
 							  file, index,
-							  PAGE_SIZE);
+							  end - index);
 				/* drain pagevecs to help isolate_lru_page() */
 				lru_add_drain();
 				page = find_lock_page(mapping, index);