]> git.baikalelectronics.ru Git - kernel.git/commit
net: vlan: fix underflow for the real_dev refcnt
authorZiyang Xuan <william.xuanziyang@huawei.com>
Fri, 26 Nov 2021 01:59:42 +0000 (09:59 +0800)
committerJakub Kicinski <kuba@kernel.org>
Fri, 26 Nov 2021 19:20:46 +0000 (11:20 -0800)
commit253e59c3c4661ec2ec297ecd23329dbe294cf5e8
tree2b7a1ed383d781f426a035c07b59cd44ca8d62e0
parent9421f4b2fc4bfd9ad610418ffd607eb8b5f830be
net: vlan: fix underflow for the real_dev refcnt

Inject error before dev_hold(real_dev) in register_vlan_dev(),
and execute the following testcase:

ip link add dev dummy1 type dummy
ip link add name dummy1.100 link dummy1 type vlan id 100
ip link del dev dummy1

When the dummy netdevice is removed, we will get a WARNING as following:

=======================================================================
refcount_t: decrement hit 0; leaking memory.
WARNING: CPU: 2 PID: 0 at lib/refcount.c:31 refcount_warn_saturate+0xbf/0x1e0

and an endless loop of:

=======================================================================
unregister_netdevice: waiting for dummy1 to become free. Usage count = -1073741824

That is because dev_put(real_dev) in vlan_dev_free() be called without
dev_hold(real_dev) in register_vlan_dev(). It makes the refcnt of real_dev
underflow.

Move the dev_hold(real_dev) to vlan_dev_init() which is the call-back of
ndo_init(). That makes dev_hold() and dev_put() for vlan's real_dev
symmetrical.

Fixes: 52f553199741 ("net: vlan: fix a UAF in vlan_dev_real_dev()")
Reported-by: Petr Machata <petrm@nvidia.com>
Suggested-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Ziyang Xuan <william.xuanziyang@huawei.com>
Link: https://lore.kernel.org/r/20211126015942.2918542-1-william.xuanziyang@huawei.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/8021q/vlan.c
net/8021q/vlan_dev.c