diff mbox series

[net] ipv6: avoid possible NULL deref in rt6_uncached_list_flush_dev()

Message ID 20240913083147.3095442-1-edumazet@google.com (mailing list archive)
State Accepted
Commit 04ccecfa959d3b9ae7348780d8e379c6486176ac
Delegated to: Netdev Maintainers
Headers show
Series [net] ipv6: avoid possible NULL deref in rt6_uncached_list_flush_dev() | expand

Checks

Context Check Description
netdev/series_format success Single patches do not need cover letters
netdev/tree_selection success Clearly marked for net, async
netdev/ynl success Generated files up to date; no warnings/errors; no diff in generated;
netdev/fixes_present success Fixes tag present in non-next series
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 16 this patch: 16
netdev/build_tools success No tools touched, skip
netdev/cc_maintainers success CCed 7 of 7 maintainers
netdev/build_clang success Errors and warnings before: 16 this patch: 16
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/deprecated_api success None detected
netdev/check_selftest success No net selftest shell script
netdev/verify_fixes success Fixes tag looks correct
netdev/build_allmodconfig_warn success Errors and warnings before: 17 this patch: 17
netdev/checkpatch warning WARNING: Possible repeated word: 'Google'
netdev/build_clang_rust success No Rust files in patch. Skipping build
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/source_inline success Was 0 now: 0
netdev/contest success net-next-2024-09-13--15-00 (tests: 764)

Commit Message

Eric Dumazet Sept. 13, 2024, 8:31 a.m. UTC 
Blamed commit accidentally removed a check for rt->rt6i_idev being NULL,
as spotted by syzbot:

Oops: general protection fault, probably for non-canonical address 0xdffffc0000000000: 0000 [#1] PREEMPT SMP KASAN PTI
KASAN: null-ptr-deref in range [0x0000000000000000-0x0000000000000007]
CPU: 1 UID: 0 PID: 10998 Comm: syz-executor Not tainted 6.11.0-rc6-syzkaller-00208-g625403177711 #0
Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 08/06/2024
 RIP: 0010:rt6_uncached_list_flush_dev net/ipv6/route.c:177 [inline]
 RIP: 0010:rt6_disable_ip+0x33e/0x7e0 net/ipv6/route.c:4914
Code: 41 80 3c 04 00 74 0a e8 90 d0 9b f7 48 8b 7c 24 08 48 8b 07 48 89 44 24 10 4c 89 f0 48 c1 e8 03 48 b9 00 00 00 00 00 fc ff df <80> 3c 08 00 74 08 4c 89 f7 e8 64 d0 9b f7 48 8b 44 24 18 49 39 06
RSP: 0018:ffffc900047374e0 EFLAGS: 00010246
RAX: 0000000000000000 RBX: 1ffff1100fdf8f33 RCX: dffffc0000000000
RDX: 0000000000000000 RSI: 0000000000000004 RDI: ffff88807efc78c0
RBP: ffffc900047375d0 R08: 0000000000000003 R09: fffff520008e6e8c
R10: dffffc0000000000 R11: fffff520008e6e8c R12: 1ffff1100fdf8f18
R13: ffff88807efc7998 R14: 0000000000000000 R15: ffff88807efc7930
FS:  0000000000000000(0000) GS:ffff8880b8900000(0000) knlGS:0000000000000000
CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 0000000020002a80 CR3: 0000000022f62000 CR4: 00000000003506f0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
Call Trace:
 <TASK>
  addrconf_ifdown+0x15d/0x1bd0 net/ipv6/addrconf.c:3856
 addrconf_notify+0x3cb/0x1020
  notifier_call_chain+0x19f/0x3e0 kernel/notifier.c:93
  call_netdevice_notifiers_extack net/core/dev.c:2032 [inline]
  call_netdevice_notifiers net/core/dev.c:2046 [inline]
  unregister_netdevice_many_notify+0xd81/0x1c40 net/core/dev.c:11352
  unregister_netdevice_many net/core/dev.c:11414 [inline]
  unregister_netdevice_queue+0x303/0x370 net/core/dev.c:11289
  unregister_netdevice include/linux/netdevice.h:3129 [inline]
  __tun_detach+0x6b9/0x1600 drivers/net/tun.c:685
  tun_detach drivers/net/tun.c:701 [inline]
  tun_chr_close+0x108/0x1b0 drivers/net/tun.c:3510
  __fput+0x24a/0x8a0 fs/file_table.c:422
  task_work_run+0x24f/0x310 kernel/task_work.c:228
  exit_task_work include/linux/task_work.h:40 [inline]
  do_exit+0xa2f/0x27f0 kernel/exit.c:882
  do_group_exit+0x207/0x2c0 kernel/exit.c:1031
  __do_sys_exit_group kernel/exit.c:1042 [inline]
  __se_sys_exit_group kernel/exit.c:1040 [inline]
  __x64_sys_exit_group+0x3f/0x40 kernel/exit.c:1040
  x64_sys_call+0x2634/0x2640 arch/x86/include/generated/asm/syscalls_64.h:232
  do_syscall_x64 arch/x86/entry/common.c:52 [inline]
  do_syscall_64+0xf3/0x230 arch/x86/entry/common.c:83
 entry_SYSCALL_64_after_hwframe+0x77/0x7f
RIP: 0033:0x7f1acc77def9
Code: Unable to access opcode bytes at 0x7f1acc77decf.
RSP: 002b:00007ffeb26fa738 EFLAGS: 00000246 ORIG_RAX: 00000000000000e7
RAX: ffffffffffffffda RBX: 0000000000000000 RCX: 00007f1acc77def9
RDX: 0000000000000000 RSI: 0000000000000000 RDI: 0000000000000043
RBP: 00007f1acc7dd508 R08: 00007ffeb26f84d7 R09: 0000000000000003
R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000001
R13: 0000000000000003 R14: 00000000ffffffff R15: 00007ffeb26fa8e0
 </TASK>
Modules linked in:
---[ end trace 0000000000000000 ]---
 RIP: 0010:rt6_uncached_list_flush_dev net/ipv6/route.c:177 [inline]
 RIP: 0010:rt6_disable_ip+0x33e/0x7e0 net/ipv6/route.c:4914
Code: 41 80 3c 04 00 74 0a e8 90 d0 9b f7 48 8b 7c 24 08 48 8b 07 48 89 44 24 10 4c 89 f0 48 c1 e8 03 48 b9 00 00 00 00 00 fc ff df <80> 3c 08 00 74 08 4c 89 f7 e8 64 d0 9b f7 48 8b 44 24 18 49 39 06
RSP: 0018:ffffc900047374e0 EFLAGS: 00010246
RAX: 0000000000000000 RBX: 1ffff1100fdf8f33 RCX: dffffc0000000000
RDX: 0000000000000000 RSI: 0000000000000004 RDI: ffff88807efc78c0
RBP: ffffc900047375d0 R08: 0000000000000003 R09: fffff520008e6e8c
R10: dffffc0000000000 R11: fffff520008e6e8c R12: 1ffff1100fdf8f18
R13: ffff88807efc7998 R14: 0000000000000000 R15: ffff88807efc7930
FS:  0000000000000000(0000) GS:ffff8880b8900000(0000) knlGS:0000000000000000
CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 0000000020002a80 CR3: 0000000022f62000 CR4: 00000000003506f0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400

Fixes: e332bc67cf5e ("ipv6: Don't call with rt6_uncached_list_flush_dev")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Eric W. Biederman <ebiederm@xmission.com>
Cc: Martin KaFai Lau <kafai@fb.com>
---
 net/ipv6/route.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Simon Horman Sept. 13, 2024, 11:28 a.m. UTC | #1 
On Fri, Sep 13, 2024 at 08:31:47AM +0000, Eric Dumazet wrote:
> Blamed commit accidentally removed a check for rt->rt6i_idev being NULL,
> as spotted by syzbot:

...

> Fixes: e332bc67cf5e ("ipv6: Don't call with rt6_uncached_list_flush_dev")
> Signed-off-by: Eric Dumazet <edumazet@google.com>
> Cc: Eric W. Biederman <ebiederm@xmission.com>
> Cc: Martin KaFai Lau <kafai@fb.com>

Reviewed-by: Simon Horman <horms@kernel.org>
David Ahern Sept. 13, 2024, 2:31 p.m. UTC | #2 
On 9/13/24 2:31 AM, Eric Dumazet wrote:
> Blamed commit accidentally removed a check for rt->rt6i_idev being NULL,
> as spotted by syzbot:
> 

...

> Fixes: e332bc67cf5e ("ipv6: Don't call with rt6_uncached_list_flush_dev")
> Signed-off-by: Eric Dumazet <edumazet@google.com>
> Cc: Eric W. Biederman <ebiederm@xmission.com>
> Cc: Martin KaFai Lau <kafai@fb.com>
> ---
>  net/ipv6/route.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 

Reviewed-by: David Ahern <dsahern@kernel.org>
Martin KaFai Lau Sept. 13, 2024, 6:47 p.m. UTC | #3 
On 9/13/24 1:31 AM, Eric Dumazet wrote:
> Blamed commit accidentally removed a check for rt->rt6i_idev being NULL,
> as spotted by syzbot:
> 
> Oops: general protection fault, probably for non-canonical address 0xdffffc0000000000: 0000 [#1] PREEMPT SMP KASAN PTI
> KASAN: null-ptr-deref in range [0x0000000000000000-0x0000000000000007]
> CPU: 1 UID: 0 PID: 10998 Comm: syz-executor Not tainted 6.11.0-rc6-syzkaller-00208-g625403177711 #0
> Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 08/06/2024
>   RIP: 0010:rt6_uncached_list_flush_dev net/ipv6/route.c:177 [inline]
>   RIP: 0010:rt6_disable_ip+0x33e/0x7e0 net/ipv6/route.c:4914
> Code: 41 80 3c 04 00 74 0a e8 90 d0 9b f7 48 8b 7c 24 08 48 8b 07 48 89 44 24 10 4c 89 f0 48 c1 e8 03 48 b9 00 00 00 00 00 fc ff df <80> 3c 08 00 74 08 4c 89 f7 e8 64 d0 9b f7 48 8b 44 24 18 49 39 06
> RSP: 0018:ffffc900047374e0 EFLAGS: 00010246
> RAX: 0000000000000000 RBX: 1ffff1100fdf8f33 RCX: dffffc0000000000
> RDX: 0000000000000000 RSI: 0000000000000004 RDI: ffff88807efc78c0
> RBP: ffffc900047375d0 R08: 0000000000000003 R09: fffff520008e6e8c
> R10: dffffc0000000000 R11: fffff520008e6e8c R12: 1ffff1100fdf8f18
> R13: ffff88807efc7998 R14: 0000000000000000 R15: ffff88807efc7930
> FS:  0000000000000000(0000) GS:ffff8880b8900000(0000) knlGS:0000000000000000
> CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
> CR2: 0000000020002a80 CR3: 0000000022f62000 CR4: 00000000003506f0
> DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
> DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
> Call Trace:
>   <TASK>
>    addrconf_ifdown+0x15d/0x1bd0 net/ipv6/addrconf.c:3856
>   addrconf_notify+0x3cb/0x1020
>    notifier_call_chain+0x19f/0x3e0 kernel/notifier.c:93
>    call_netdevice_notifiers_extack net/core/dev.c:2032 [inline]
>    call_netdevice_notifiers net/core/dev.c:2046 [inline]
>    unregister_netdevice_many_notify+0xd81/0x1c40 net/core/dev.c:11352
>    unregister_netdevice_many net/core/dev.c:11414 [inline]
>    unregister_netdevice_queue+0x303/0x370 net/core/dev.c:11289
>    unregister_netdevice include/linux/netdevice.h:3129 [inline]
>    __tun_detach+0x6b9/0x1600 drivers/net/tun.c:685
>    tun_detach drivers/net/tun.c:701 [inline]
>    tun_chr_close+0x108/0x1b0 drivers/net/tun.c:3510
>    __fput+0x24a/0x8a0 fs/file_table.c:422
>    task_work_run+0x24f/0x310 kernel/task_work.c:228
>    exit_task_work include/linux/task_work.h:40 [inline]
>    do_exit+0xa2f/0x27f0 kernel/exit.c:882
>    do_group_exit+0x207/0x2c0 kernel/exit.c:1031
>    __do_sys_exit_group kernel/exit.c:1042 [inline]
>    __se_sys_exit_group kernel/exit.c:1040 [inline]
>    __x64_sys_exit_group+0x3f/0x40 kernel/exit.c:1040
>    x64_sys_call+0x2634/0x2640 arch/x86/include/generated/asm/syscalls_64.h:232
>    do_syscall_x64 arch/x86/entry/common.c:52 [inline]
>    do_syscall_64+0xf3/0x230 arch/x86/entry/common.c:83
>   entry_SYSCALL_64_after_hwframe+0x77/0x7f
> RIP: 0033:0x7f1acc77def9
> Code: Unable to access opcode bytes at 0x7f1acc77decf.
> RSP: 002b:00007ffeb26fa738 EFLAGS: 00000246 ORIG_RAX: 00000000000000e7
> RAX: ffffffffffffffda RBX: 0000000000000000 RCX: 00007f1acc77def9
> RDX: 0000000000000000 RSI: 0000000000000000 RDI: 0000000000000043
> RBP: 00007f1acc7dd508 R08: 00007ffeb26f84d7 R09: 0000000000000003
> R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000001
> R13: 0000000000000003 R14: 00000000ffffffff R15: 00007ffeb26fa8e0
>   </TASK>
> Modules linked in:
> ---[ end trace 0000000000000000 ]---
>   RIP: 0010:rt6_uncached_list_flush_dev net/ipv6/route.c:177 [inline]
>   RIP: 0010:rt6_disable_ip+0x33e/0x7e0 net/ipv6/route.c:4914
> Code: 41 80 3c 04 00 74 0a e8 90 d0 9b f7 48 8b 7c 24 08 48 8b 07 48 89 44 24 10 4c 89 f0 48 c1 e8 03 48 b9 00 00 00 00 00 fc ff df <80> 3c 08 00 74 08 4c 89 f7 e8 64 d0 9b f7 48 8b 44 24 18 49 39 06
> RSP: 0018:ffffc900047374e0 EFLAGS: 00010246
> RAX: 0000000000000000 RBX: 1ffff1100fdf8f33 RCX: dffffc0000000000
> RDX: 0000000000000000 RSI: 0000000000000004 RDI: ffff88807efc78c0
> RBP: ffffc900047375d0 R08: 0000000000000003 R09: fffff520008e6e8c
> R10: dffffc0000000000 R11: fffff520008e6e8c R12: 1ffff1100fdf8f18
> R13: ffff88807efc7998 R14: 0000000000000000 R15: ffff88807efc7930
> FS:  0000000000000000(0000) GS:ffff8880b8900000(0000) knlGS:0000000000000000
> CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
> CR2: 0000000020002a80 CR3: 0000000022f62000 CR4: 00000000003506f0
> DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
> DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
> 
> Fixes: e332bc67cf5e ("ipv6: Don't call with rt6_uncached_list_flush_dev")
> Signed-off-by: Eric Dumazet <edumazet@google.com>
> Cc: Eric W. Biederman <ebiederm@xmission.com>
> Cc: Martin KaFai Lau <kafai@fb.com>
> ---
>   net/ipv6/route.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/net/ipv6/route.c b/net/ipv6/route.c
> index 219701caba1e9496f4a7add7e97251ab111a67f0..b4dcd8f3e7babae45e0b40bd80f871be06757b82 100644
> --- a/net/ipv6/route.c
> +++ b/net/ipv6/route.c
> @@ -174,7 +174,7 @@ static void rt6_uncached_list_flush_dev(struct net_device *dev)
>   			struct net_device *rt_dev = rt->dst.dev;
>   			bool handled = false;
>   
> -			if (rt_idev->dev == dev) {
> +			if (rt_idev && rt_idev->dev == dev) {

Acked-by: Martin KaFai Lau <martin.lau@kernel.org>
patchwork-bot+netdevbpf@kernel.org Sept. 14, 2024, 3:20 a.m. UTC | #4 
Hello:

This patch was applied to netdev/net.git (main)
by Jakub Kicinski <kuba@kernel.org>:

On Fri, 13 Sep 2024 08:31:47 +0000 you wrote:
> Blamed commit accidentally removed a check for rt->rt6i_idev being NULL,
> as spotted by syzbot:
> 
> Oops: general protection fault, probably for non-canonical address 0xdffffc0000000000: 0000 [#1] PREEMPT SMP KASAN PTI
> KASAN: null-ptr-deref in range [0x0000000000000000-0x0000000000000007]
> CPU: 1 UID: 0 PID: 10998 Comm: syz-executor Not tainted 6.11.0-rc6-syzkaller-00208-g625403177711 #0
> Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 08/06/2024
>  RIP: 0010:rt6_uncached_list_flush_dev net/ipv6/route.c:177 [inline]
>  RIP: 0010:rt6_disable_ip+0x33e/0x7e0 net/ipv6/route.c:4914
> Code: 41 80 3c 04 00 74 0a e8 90 d0 9b f7 48 8b 7c 24 08 48 8b 07 48 89 44 24 10 4c 89 f0 48 c1 e8 03 48 b9 00 00 00 00 00 fc ff df <80> 3c 08 00 74 08 4c 89 f7 e8 64 d0 9b f7 48 8b 44 24 18 49 39 06
> RSP: 0018:ffffc900047374e0 EFLAGS: 00010246
> RAX: 0000000000000000 RBX: 1ffff1100fdf8f33 RCX: dffffc0000000000
> RDX: 0000000000000000 RSI: 0000000000000004 RDI: ffff88807efc78c0
> RBP: ffffc900047375d0 R08: 0000000000000003 R09: fffff520008e6e8c
> R10: dffffc0000000000 R11: fffff520008e6e8c R12: 1ffff1100fdf8f18
> R13: ffff88807efc7998 R14: 0000000000000000 R15: ffff88807efc7930
> FS:  0000000000000000(0000) GS:ffff8880b8900000(0000) knlGS:0000000000000000
> CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
> CR2: 0000000020002a80 CR3: 0000000022f62000 CR4: 00000000003506f0
> DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
> DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
> Call Trace:
>  <TASK>
>   addrconf_ifdown+0x15d/0x1bd0 net/ipv6/addrconf.c:3856
>  addrconf_notify+0x3cb/0x1020
>   notifier_call_chain+0x19f/0x3e0 kernel/notifier.c:93
>   call_netdevice_notifiers_extack net/core/dev.c:2032 [inline]
>   call_netdevice_notifiers net/core/dev.c:2046 [inline]
>   unregister_netdevice_many_notify+0xd81/0x1c40 net/core/dev.c:11352
>   unregister_netdevice_many net/core/dev.c:11414 [inline]
>   unregister_netdevice_queue+0x303/0x370 net/core/dev.c:11289
>   unregister_netdevice include/linux/netdevice.h:3129 [inline]
>   __tun_detach+0x6b9/0x1600 drivers/net/tun.c:685
>   tun_detach drivers/net/tun.c:701 [inline]
>   tun_chr_close+0x108/0x1b0 drivers/net/tun.c:3510
>   __fput+0x24a/0x8a0 fs/file_table.c:422
>   task_work_run+0x24f/0x310 kernel/task_work.c:228
>   exit_task_work include/linux/task_work.h:40 [inline]
>   do_exit+0xa2f/0x27f0 kernel/exit.c:882
>   do_group_exit+0x207/0x2c0 kernel/exit.c:1031
>   __do_sys_exit_group kernel/exit.c:1042 [inline]
>   __se_sys_exit_group kernel/exit.c:1040 [inline]
>   __x64_sys_exit_group+0x3f/0x40 kernel/exit.c:1040
>   x64_sys_call+0x2634/0x2640 arch/x86/include/generated/asm/syscalls_64.h:232
>   do_syscall_x64 arch/x86/entry/common.c:52 [inline]
>   do_syscall_64+0xf3/0x230 arch/x86/entry/common.c:83
>  entry_SYSCALL_64_after_hwframe+0x77/0x7f
> RIP: 0033:0x7f1acc77def9
> Code: Unable to access opcode bytes at 0x7f1acc77decf.
> RSP: 002b:00007ffeb26fa738 EFLAGS: 00000246 ORIG_RAX: 00000000000000e7
> RAX: ffffffffffffffda RBX: 0000000000000000 RCX: 00007f1acc77def9
> RDX: 0000000000000000 RSI: 0000000000000000 RDI: 0000000000000043
> RBP: 00007f1acc7dd508 R08: 00007ffeb26f84d7 R09: 0000000000000003
> R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000001
> R13: 0000000000000003 R14: 00000000ffffffff R15: 00007ffeb26fa8e0
>  </TASK>
> Modules linked in:
> 
> [...]

Here is the summary with links:
  - [net] ipv6: avoid possible NULL deref in rt6_uncached_list_flush_dev()
    https://git.kernel.org/netdev/net/c/04ccecfa959d

You are awesome, thank you!
diff mbox series

Patch

diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 219701caba1e9496f4a7add7e97251ab111a67f0..b4dcd8f3e7babae45e0b40bd80f871be06757b82 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -174,7 +174,7 @@  static void rt6_uncached_list_flush_dev(struct net_device *dev)
 			struct net_device *rt_dev = rt->dst.dev;
 			bool handled = false;
 
-			if (rt_idev->dev == dev) {
+			if (rt_idev && rt_idev->dev == dev) {
 				rt->rt6i_idev = in6_dev_get(blackhole_netdev);
 				in6_dev_put(rt_idev);
 				handled = true;