* [PATCH 5.15 v4] mm/filemap: fix UAF in find_lock_entries
@ 2022-07-07 2:09 Liu Shixin
2022-07-07 3:09 ` Matthew Wilcox
0 siblings, 1 reply; 3+ messages in thread
From: Liu Shixin @ 2022-07-07 2:09 UTC (permalink / raw)
To: Greg Kroah-Hartman, Andrew Morton, Matthew Wilcox, Jan Kara,
William Kucharski, Christoph Hellwig
Cc: linux-kernel, stable, Liu Shixin
Release refcount after xas_set to fix UAF which may cause panic like this:
page:ffffea000491fa40 refcount:1 mapcount:0 mapping:0000000000000000 index:0x1 pfn:0x1247e9
head:ffffea000491fa00 order:3 compound_mapcount:0 compound_pincount:0
memcg:ffff888104f91091
flags: 0x2fffff80010200(slab|head|node=0|zone=2|lastcpupid=0x1fffff)
...
page dumped because: VM_BUG_ON_PAGE(PageTail(page))
------------[ cut here ]------------
kernel BUG at include/linux/page-flags.h:632!
invalid opcode: 0000 [#1] SMP DEBUG_PAGEALLOC KASAN
CPU: 1 PID: 7642 Comm: sh Not tainted 5.15.51-dirty #26
...
Call Trace:
<TASK>
__invalidate_mapping_pages+0xe7/0x540
drop_pagecache_sb+0x159/0x320
iterate_supers+0x120/0x240
drop_caches_sysctl_handler+0xaa/0xe0
proc_sys_call_handler+0x2b4/0x480
new_sync_write+0x3d6/0x5c0
vfs_write+0x446/0x7a0
ksys_write+0x105/0x210
do_syscall_64+0x35/0x80
entry_SYSCALL_64_after_hwframe+0x44/0xae
RIP: 0033:0x7f52b5733130
...
This problem has been fixed on mainline by patch 6b24ca4a1a8d ("mm: Use
multi-index entries in the page cache") since it deletes the related code.
Fixes: 5c211ba29deb ("mm: add and use find_lock_entries")
Signed-off-by: Liu Shixin <liushixin2@huawei.com>
---
mm/filemap.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/mm/filemap.c b/mm/filemap.c
index 00e391e75880..dbc461703ff4 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -2090,7 +2090,11 @@ unsigned find_lock_entries(struct address_space *mapping, pgoff_t start,
rcu_read_lock();
while ((page = find_get_entry(&xas, end, XA_PRESENT))) {
+ unsigned long next_idx = xas.xa_index + 1;
+
if (!xa_is_value(page)) {
+ if (PageTransHuge(page))
+ next_idx = page->index + thp_nr_pages(page);
if (page->index < start)
goto put;
if (page->index + thp_nr_pages(page) - 1 > end)
@@ -2111,13 +2115,11 @@ unsigned find_lock_entries(struct address_space *mapping, pgoff_t start,
put:
put_page(page);
next:
- if (!xa_is_value(page) && PageTransHuge(page)) {
- unsigned int nr_pages = thp_nr_pages(page);
-
+ if (next_idx != xas.xa_index + 1) {
/* Final THP may cross MAX_LFS_FILESIZE on 32-bit */
- xas_set(&xas, page->index + nr_pages);
- if (xas.xa_index < nr_pages)
+ if (next_idx < xas.xa_index)
break;
+ xas_set(&xas, next_idx);
}
}
rcu_read_unlock();
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH 5.15 v4] mm/filemap: fix UAF in find_lock_entries
2022-07-07 2:09 [PATCH 5.15 v4] mm/filemap: fix UAF in find_lock_entries Liu Shixin
@ 2022-07-07 3:09 ` Matthew Wilcox
2022-07-07 18:04 ` Greg Kroah-Hartman
0 siblings, 1 reply; 3+ messages in thread
From: Matthew Wilcox @ 2022-07-07 3:09 UTC (permalink / raw)
To: Liu Shixin
Cc: Greg Kroah-Hartman, Andrew Morton, Jan Kara, William Kucharski,
Christoph Hellwig, linux-kernel, stable
On Thu, Jul 07, 2022 at 10:09:38AM +0800, Liu Shixin wrote:
> Release refcount after xas_set to fix UAF which may cause panic like this:
>
> page:ffffea000491fa40 refcount:1 mapcount:0 mapping:0000000000000000 index:0x1 pfn:0x1247e9
> head:ffffea000491fa00 order:3 compound_mapcount:0 compound_pincount:0
> memcg:ffff888104f91091
> flags: 0x2fffff80010200(slab|head|node=0|zone=2|lastcpupid=0x1fffff)
> ...
> page dumped because: VM_BUG_ON_PAGE(PageTail(page))
> ------------[ cut here ]------------
> kernel BUG at include/linux/page-flags.h:632!
> invalid opcode: 0000 [#1] SMP DEBUG_PAGEALLOC KASAN
> CPU: 1 PID: 7642 Comm: sh Not tainted 5.15.51-dirty #26
> ...
> Call Trace:
> <TASK>
> __invalidate_mapping_pages+0xe7/0x540
> drop_pagecache_sb+0x159/0x320
> iterate_supers+0x120/0x240
> drop_caches_sysctl_handler+0xaa/0xe0
> proc_sys_call_handler+0x2b4/0x480
> new_sync_write+0x3d6/0x5c0
> vfs_write+0x446/0x7a0
> ksys_write+0x105/0x210
> do_syscall_64+0x35/0x80
> entry_SYSCALL_64_after_hwframe+0x44/0xae
> RIP: 0033:0x7f52b5733130
> ...
>
> This problem has been fixed on mainline by patch 6b24ca4a1a8d ("mm: Use
> multi-index entries in the page cache") since it deletes the related code.
>
> Fixes: 5c211ba29deb ("mm: add and use find_lock_entries")
> Signed-off-by: Liu Shixin <liushixin2@huawei.com>
Acked-by: Matthew Wilcox (Oracle) <willy@infradead.org>
> ---
> mm/filemap.c | 12 +++++++-----
> 1 file changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/mm/filemap.c b/mm/filemap.c
> index 00e391e75880..dbc461703ff4 100644
> --- a/mm/filemap.c
> +++ b/mm/filemap.c
> @@ -2090,7 +2090,11 @@ unsigned find_lock_entries(struct address_space *mapping, pgoff_t start,
>
> rcu_read_lock();
> while ((page = find_get_entry(&xas, end, XA_PRESENT))) {
> + unsigned long next_idx = xas.xa_index + 1;
> +
> if (!xa_is_value(page)) {
> + if (PageTransHuge(page))
> + next_idx = page->index + thp_nr_pages(page);
> if (page->index < start)
> goto put;
> if (page->index + thp_nr_pages(page) - 1 > end)
> @@ -2111,13 +2115,11 @@ unsigned find_lock_entries(struct address_space *mapping, pgoff_t start,
> put:
> put_page(page);
> next:
> - if (!xa_is_value(page) && PageTransHuge(page)) {
> - unsigned int nr_pages = thp_nr_pages(page);
> -
> + if (next_idx != xas.xa_index + 1) {
> /* Final THP may cross MAX_LFS_FILESIZE on 32-bit */
> - xas_set(&xas, page->index + nr_pages);
> - if (xas.xa_index < nr_pages)
> + if (next_idx < xas.xa_index)
> break;
> + xas_set(&xas, next_idx);
> }
> }
> rcu_read_unlock();
> --
> 2.25.1
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH 5.15 v4] mm/filemap: fix UAF in find_lock_entries
2022-07-07 3:09 ` Matthew Wilcox
@ 2022-07-07 18:04 ` Greg Kroah-Hartman
0 siblings, 0 replies; 3+ messages in thread
From: Greg Kroah-Hartman @ 2022-07-07 18:04 UTC (permalink / raw)
To: Matthew Wilcox
Cc: Liu Shixin, Andrew Morton, Jan Kara, William Kucharski,
Christoph Hellwig, linux-kernel, stable
On Thu, Jul 07, 2022 at 04:09:29AM +0100, Matthew Wilcox wrote:
> On Thu, Jul 07, 2022 at 10:09:38AM +0800, Liu Shixin wrote:
> > Release refcount after xas_set to fix UAF which may cause panic like this:
> >
> > page:ffffea000491fa40 refcount:1 mapcount:0 mapping:0000000000000000 index:0x1 pfn:0x1247e9
> > head:ffffea000491fa00 order:3 compound_mapcount:0 compound_pincount:0
> > memcg:ffff888104f91091
> > flags: 0x2fffff80010200(slab|head|node=0|zone=2|lastcpupid=0x1fffff)
> > ...
> > page dumped because: VM_BUG_ON_PAGE(PageTail(page))
> > ------------[ cut here ]------------
> > kernel BUG at include/linux/page-flags.h:632!
> > invalid opcode: 0000 [#1] SMP DEBUG_PAGEALLOC KASAN
> > CPU: 1 PID: 7642 Comm: sh Not tainted 5.15.51-dirty #26
> > ...
> > Call Trace:
> > <TASK>
> > __invalidate_mapping_pages+0xe7/0x540
> > drop_pagecache_sb+0x159/0x320
> > iterate_supers+0x120/0x240
> > drop_caches_sysctl_handler+0xaa/0xe0
> > proc_sys_call_handler+0x2b4/0x480
> > new_sync_write+0x3d6/0x5c0
> > vfs_write+0x446/0x7a0
> > ksys_write+0x105/0x210
> > do_syscall_64+0x35/0x80
> > entry_SYSCALL_64_after_hwframe+0x44/0xae
> > RIP: 0033:0x7f52b5733130
> > ...
> >
> > This problem has been fixed on mainline by patch 6b24ca4a1a8d ("mm: Use
> > multi-index entries in the page cache") since it deletes the related code.
> >
> > Fixes: 5c211ba29deb ("mm: add and use find_lock_entries")
> > Signed-off-by: Liu Shixin <liushixin2@huawei.com>
>
> Acked-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Now queued up, thanks.
greg k-h
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-07-07 18:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-07-07 2:09 [PATCH 5.15 v4] mm/filemap: fix UAF in find_lock_entries Liu Shixin
2022-07-07 3:09 ` Matthew Wilcox
2022-07-07 18:04 ` Greg Kroah-Hartman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox