Commit 756a3804 authored by Liu Shixin's avatar Liu Shixin Committed by Zheng Zengkai
Browse files

mm/filemap: fix UAF in find_lock_entries 

maillist inclusion
category: bugfix
bugzilla: 186821, https://gitee.com/openeuler/kernel/issues/I5G69G

Reference: https://lore.kernel.org/all/20220707020938.2122198-1-liushixin2@huawei.com/



--------------------------------

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 6b24ca4a ("mm: Use
multi-index entries in the page cache") since it deletes the related code.

Fixes: 5c211ba2 ("mm: add and use find_lock_entries")
Signed-off-by: default avatarLiu Shixin <liushixin2@huawei.com>
Acked-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Conflicts:
	mm/filemap.c
Signed-off-by: default avatarLiu Shixin <liushixin2@huawei.com>
Reviewed-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent a3fbc9d4

mm/filemap.c

+7 −5
Original line number Diff line number Diff line
@@ -1951,7 +1951,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;

			VM_BUG_ON_PAGE(page->index != xas.xa_index, page);
@@ -1973,13 +1977,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();