summaryrefslogtreecommitdiffstats
path: root/net/ipv6/sit.c
diff options
context:
space:
mode:
authorJakub Kicinski <kuba@kernel.org>2021-01-13 17:29:47 -0800
committerJakub Kicinski <kuba@kernel.org>2021-01-14 10:26:46 -0800
commit47e4bb147a96f1c9b4e7691e7e994e53838bfff8 (patch)
tree9f6f1441fd7d9f964c6019f16fd80a292c8bd035 /net/ipv6/sit.c
parent5b55299eed78538cc4746e50ee97103a1643249c (diff)
downloadlinux-47e4bb147a96f1c9b4e7691e7e994e53838bfff8.tar.gz
linux-47e4bb147a96f1c9b4e7691e7e994e53838bfff8.tar.bz2
linux-47e4bb147a96f1c9b4e7691e7e994e53838bfff8.zip
net: sit: unregister_netdevice on newlink's error path
We need to unregister the netdevice if config failed. .ndo_uninit takes care of most of the heavy lifting. This was uncovered by recent commit c269a24ce057 ("net: make free_netdev() more lenient with unregistering devices"). Previously the partially-initialized device would be left in the system. Reported-and-tested-by: syzbot+2393580080a2da190f04@syzkaller.appspotmail.com Fixes: e2f1f072db8d ("sit: allow to configure 6rd tunnels via netlink") Acked-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Link: https://lore.kernel.org/r/20210114012947.2515313-1-kuba@kernel.org Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/ipv6/sit.c')
-rw-r--r--net/ipv6/sit.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
index 2da0ee703779..93636867aee2 100644
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -1645,8 +1645,11 @@ static int ipip6_newlink(struct net *src_net, struct net_device *dev,
}
#ifdef CONFIG_IPV6_SIT_6RD
- if (ipip6_netlink_6rd_parms(data, &ip6rd))
+ if (ipip6_netlink_6rd_parms(data, &ip6rd)) {
err = ipip6_tunnel_update_6rd(nt, &ip6rd);
+ if (err < 0)
+ unregister_netdevice_queue(dev, NULL);
+ }
#endif
return err;