Commit 28489be2 authored Mar 08, 2022 by Ido Schimmel Committed by Zheng Zengkai Mar 08, 2022

ipv6: blackhole_netdev needs snmp6 counters

net-next inclusion
from net-next-v5.17-rc5
commit dd263a8c
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I4VZN0?from=project-issue

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git/commit/?id=dd263a8cb1941d2d34a55633bd5366d9bebf4be8



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

Whenever rt6_uncached_list_flush_dev() swaps rt->rt6_idev
to the blackhole device, parts of IPv6 stack might still need
to increment one SNMP counter.

Root cause, patch from Ido, changelog from Eric :)

This bug suggests that we need to audit rt->rt6_idev usages
and make sure they are properly using RCU protection.

Fixes: e5f80fcf ("ipv6: give an IPv6 dev to blackhole_netdev")
Signed-off-by: Ido Schimmel <idosch@nvidia.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Reported-by: syzbot <syzkaller@googlegroups.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Conflicts:
	net/ipv6/addrconf.c
Signed-off-by: Ziyang Xuan <william.xuanziyang@huawei.com>
Reviewed-by: Wei Yongjun <weiyongjun1@huawei.com>
Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com>

parent 779596b8

net/ipv6/addrconf.c

+9 −9

Original line number	Diff line number	Diff line
		@@ -395,7 +395,6 @@ static struct inet6_dev ipv6_add_dev(struct net_device dev)
		/* We refer to the device */
		dev_hold(dev);

		if (dev != blackhole_netdev) {
		if (snmp6_alloc_dev(ndev) < 0) {
		netdev_dbg(dev, "%s: cannot allocate memory for statistics\n",
		__func__);
		@@ -405,6 +404,7 @@ static struct inet6_dev ipv6_add_dev(struct net_device dev)
		return ERR_PTR(err);
		}

		if (dev != blackhole_netdev) {
		if (snmp6_register_dev(ndev) < 0) {
		netdev_dbg(dev, "%s: cannot create /proc/net/dev_snmp6/%s\n",
		__func__, dev->name);