mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-03-16 12:14:06 +00:00
mm/filemap: Fix handling of THPs in generic_file_buffered_read()
When a THP is present in the page cache, we can return it several times, leading to userspace seeing the same data repeatedly if doing a read() that crosses a 64-page boundary. This is probably not a security issue (since the data all comes from the same file), but it can be interpreted as a transient data corruption issue. Fortunately, it is very rare as it can only occur when CONFIG_READ_ONLY_THP_FOR_FS is enabled, and it can only happen to executables. We don't often call read() on executables. This bug is fixed differently in v5.17 by commit6b24ca4a1a
("mm: Use multi-index entries in the page cache"). That commit is unsuitable for backporting, so fix this in the clearest way. It sacrifices a little performance for clarity, but this should never be a performance path in these kernel versions. Fixes:cbd59c48ae
("mm/filemap: use head pages in generic_file_buffered_read") Cc: stable@vger.kernel.org # v5.15, v5.16 Link: https://lore.kernel.org/r/df3b5d1c-a36b-2c73-3e27-99e74983de3a@suse.cz/ Analyzed-by: Adam Majer <amajer@suse.com> Analyzed-by: Dirk Mueller <dmueller@suse.com> Bisected-by: Takashi Iwai <tiwai@suse.de> Reported-by: Vlastimil Babka <vbabka@suse.cz> Tested-by: Vlastimil Babka <vbabka@suse.cz> Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
7ae4faf126
commit
c895f69d22
1 changed files with 6 additions and 2 deletions
|
@ -2354,8 +2354,12 @@ static void filemap_get_read_batch(struct address_space *mapping,
|
|||
break;
|
||||
if (PageReadahead(head))
|
||||
break;
|
||||
xas.xa_index = head->index + thp_nr_pages(head) - 1;
|
||||
xas.xa_offset = (xas.xa_index >> xas.xa_shift) & XA_CHUNK_MASK;
|
||||
if (PageHead(head)) {
|
||||
xas_set(&xas, head->index + thp_nr_pages(head));
|
||||
/* Handle wrap correctly */
|
||||
if (xas.xa_index - 1 >= max)
|
||||
break;
|
||||
}
|
||||
continue;
|
||||
put_page:
|
||||
put_page(head);
|
||||
|
|
Loading…
Add table
Reference in a new issue