On Sat, 27 Feb 2016, Konstantin Khlebnikov wrote:
> Helper radix_tree_iter_next reset slot to NULL and next_index to index + 1,
> for tagger iteraction it also must reset cached tags in iterator to abort
> next radix_tree_next_slot and go to slow-path into radix_tree_next_chunk.
>
> Signed-off-by: Konstantin Khlebnikov <koct9i@xxxxxxxxx>
> ---
> include/linux/radix-tree.h | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/include/linux/radix-tree.h b/include/linux/radix-tree.h
> index a59f940a54f5..51a97ac8bfbf 100644
> --- a/include/linux/radix-tree.h
> +++ b/include/linux/radix-tree.h
> @@ -414,6 +414,7 @@ static inline __must_check
> void **radix_tree_iter_next(struct radix_tree_iter *iter)
> {
> iter->next_index = iter->index + 1;
> + iter->tags = 0;
> return NULL;
> }
>
Do you think this would be likely to fix the oops that Sasha Levin
reported on Feb 19th, Re: [PATCH 4/5] mm: Use radix_tree_iter_retry()?
It looked as if it was on a kernel that included your previous fixes,
but I've not delved into it at all.
Hugh
On 02/19/2016, Sasha Levin wrote:
> On 01/27/2016 04:17 PM, Matthew Wilcox wrote:
> > From: Matthew Wilcox <willy@xxxxxxxxxxxxxxx>
> >
> > Instead of a 'goto restart', we can now use radix_tree_iter_retry()
> > to restart from our current position. This will make a difference
> > when there are more ways to happen across an indirect pointer. And it
> > eliminates some confusing gotos.
>
> Hey Matthew,
>
> I'm seeing the following NULL ptr deref while fuzzing:
>
> [ 3380.120501] general protection fault: 0000 [#1] SMP KASAN
> [ 3380.120529] Modules linked in:
> [ 3380.120555] CPU: 2 PID: 23271 Comm: syz-executor Not tainted 4.5.0-rc4-next-20160219-sasha-00026-g7978205-dirty #2978
> [ 3380.120569] task: ffff8800a5181000 ti: ffff8801a63b8000 task.ti: ffff8801a63b8000
> [ 3380.120681] RIP: shmem_add_seals (include/linux/compiler.h:222 include/linux/radix-tree.h:206 mm/shmem.c:2001 mm/shmem.c:2100)
> [ 3380.120692] RSP: 0018:ffff8801a63bfd58 EFLAGS: 00010202
> [ 3380.120703] RAX: dffffc0000000000 RBX: 0000000000000001 RCX: 0000000000940000
> [ 3380.120714] RDX: 0000000000000001 RSI: 0000000000000004 RDI: ffff8800a5181b3c
> [ 3380.120725] RBP: ffff8801a63bfe58 R08: ffff8800a5181b40 R09: 0000000000000001
> [ 3380.120736] R10: fffff44e6f425fff R11: ffffffffbdb0a420 R12: 0000000000000008
> [ 3380.120745] R13: 0000000000000001 R14: 0000000000000001 R15: ffffea0002ad1660
> [ 3380.120759] FS: 00007fbc71e9c700(0000) GS:ffff8801d3c00000(0000) knlGS:0000000000000000
> [ 3380.120769] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
> [ 3380.120780] CR2: 0000000020010ff7 CR3: 00000001a0728000 CR4: 00000000000406e0
> [ 3380.120794] Stack:
> [ 3380.120815] ffffffffa2738239 00000008a63bfdc8 ffff8800a499e740 1ffff10034c77fba
> [ 3380.120834] ffff8801ac446da0 ffff8800a499e8f0 0000000000000000 1ffff10034c77001
> [ 3380.120852] ffff8801a63b8000 ffff8801a63b8008 ffff8801ac446f90 ffff8801ac446f98
> [ 3380.120856] Call Trace:
> [ 3380.120929] shmem_fcntl (mm/shmem.c:2135)
> [ 3380.120963] SyS_fcntl (fs/fcntl.c:336 fs/fcntl.c:372 fs/fcntl.c:357)
> [ 3380.121112] entry_SYSCALL_64_fastpath (arch/x86/entry/entry_64.S:200)
> [ 3380.122294] Code: c7 45 a0 00 00 00 00 e9 86 02 00 00 e8 cf a8 ee ff 4d 85 e4 0f 84 b2 07 00 00 48 b8 00 00 00 00 00 fc ff df 4c 89 e2 48 c1 ea 03 <80> 3c 02 00 0f 85 d4 08 00 00 49 8b 1c 24 e8 12 34 de ff 85 c0
> All code
> ========
> 0: c7 45 a0 00 00 00 00 movl $0x0,-0x60(%rbp)
> 7: e9 86 02 00 00 jmpq 0x292
> c: e8 cf a8 ee ff callq 0xffffffffffeea8e0
> 11: 4d 85 e4 test %r12,%r12
> 14: 0f 84 b2 07 00 00 je 0x7cc
> 1a: 48 b8 00 00 00 00 00 movabs $0xdffffc0000000000,%rax
> 21: fc ff df
> 24: 4c 89 e2 mov %r12,%rdx
> 27: 48 c1 ea 03 shr $0x3,%rdx
> 2b:* 80 3c 02 00 cmpb $0x0,(%rdx,%rax,1) <-- trapping instruction
> 2f: 0f 85 d4 08 00 00 jne 0x909
> 35: 49 8b 1c 24 mov (%r12),%rbx
> 39: e8 12 34 de ff callq 0xffffffffffde3450
> 3e: 85 c0 test %eax,%eax
> ...
>
> Code starting with the faulting instruction
> ===========================================
> 0: 80 3c 02 00 cmpb $0x0,(%rdx,%rax,1)
> 4: 0f 85 d4 08 00 00 jne 0x8de
> a: 49 8b 1c 24 mov (%r12),%rbx
> e: e8 12 34 de ff callq 0xffffffffffde3425
> 13: 85 c0 test %eax,%eax
> ...
> [ 3380.122312] RIP shmem_add_seals (include/linux/compiler.h:222 include/linux/radix-tree.h:206 mm/shmem.c:2001 mm/shmem.c:2100)
> [ 3380.122317] RSP <ffff8801a63bfd58>
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@xxxxxxxxx. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>