Skip to content

Commit 46ef5b8

Browse files
Wei Yongjundavem330
authored andcommitted
ip6_gre: fix null-ptr-deref in ip6gre_init_net()
KASAN report null-ptr-deref error when register_netdev() failed: KASAN: null-ptr-deref in range [0x00000000000003c0-0x00000000000003c7] CPU: 2 PID: 422 Comm: ip Not tainted 5.8.0-rc4+ #12 Call Trace: ip6gre_init_net+0x4ab/0x580 ? ip6gre_tunnel_uninit+0x3f0/0x3f0 ops_init+0xa8/0x3c0 setup_net+0x2de/0x7e0 ? rcu_read_lock_bh_held+0xb0/0xb0 ? ops_init+0x3c0/0x3c0 ? kasan_unpoison_shadow+0x33/0x40 ? __kasan_kmalloc.constprop.0+0xc2/0xd0 copy_net_ns+0x27d/0x530 create_new_namespaces+0x382/0xa30 unshare_nsproxy_namespaces+0xa1/0x1d0 ksys_unshare+0x39c/0x780 ? walk_process_tree+0x2a0/0x2a0 ? trace_hardirqs_on+0x4a/0x1b0 ? _raw_spin_unlock_irq+0x1f/0x30 ? syscall_trace_enter+0x1a7/0x330 ? do_syscall_64+0x1c/0xa0 __x64_sys_unshare+0x2d/0x40 do_syscall_64+0x56/0xa0 entry_SYSCALL_64_after_hwframe+0x44/0xa9 ip6gre_tunnel_uninit() has set 'ign->fb_tunnel_dev' to NULL, later access to ign->fb_tunnel_dev cause null-ptr-deref. Fix it by saving 'ign->fb_tunnel_dev' to local variable ndev. Fixes: dafabb6 ("ip6_gre: fix use-after-free in ip6gre_tunnel_lookup()") Reported-by: Hulk Robot <[email protected]> Signed-off-by: Wei Yongjun <[email protected]> Reviewed-by: Eric Dumazet <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent e048401 commit 46ef5b8

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

net/ipv6/ip6_gre.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1562,17 +1562,18 @@ static void ip6gre_destroy_tunnels(struct net *net, struct list_head *head)
15621562
static int __net_init ip6gre_init_net(struct net *net)
15631563
{
15641564
struct ip6gre_net *ign = net_generic(net, ip6gre_net_id);
1565+
struct net_device *ndev;
15651566
int err;
15661567

15671568
if (!net_has_fallback_tunnels(net))
15681569
return 0;
1569-
ign->fb_tunnel_dev = alloc_netdev(sizeof(struct ip6_tnl), "ip6gre0",
1570-
NET_NAME_UNKNOWN,
1571-
ip6gre_tunnel_setup);
1572-
if (!ign->fb_tunnel_dev) {
1570+
ndev = alloc_netdev(sizeof(struct ip6_tnl), "ip6gre0",
1571+
NET_NAME_UNKNOWN, ip6gre_tunnel_setup);
1572+
if (!ndev) {
15731573
err = -ENOMEM;
15741574
goto err_alloc_dev;
15751575
}
1576+
ign->fb_tunnel_dev = ndev;
15761577
dev_net_set(ign->fb_tunnel_dev, net);
15771578
/* FB netdevice is special: we have one, and only one per netns.
15781579
* Allowing to move it to another netns is clearly unsafe.
@@ -1592,7 +1593,7 @@ static int __net_init ip6gre_init_net(struct net *net)
15921593
return 0;
15931594

15941595
err_reg_dev:
1595-
free_netdev(ign->fb_tunnel_dev);
1596+
free_netdev(ndev);
15961597
err_alloc_dev:
15971598
return err;
15981599
}

0 commit comments

Comments
 (0)