Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: 563bcbae3ba2 ("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>

authored by

Ziyang Xuan and committed by
Jakub Kicinski
01d9cc2d cbb91dcb

+3 -3
-3
net/8021q/vlan.c
··· 184 184 if (err) 185 185 goto out_unregister_netdev; 186 186 187 - /* Account for reference in struct vlan_dev_priv */ 188 - dev_hold(real_dev); 189 - 190 187 vlan_stacked_transfer_operstate(real_dev, dev, vlan); 191 188 linkwatch_fire_event(dev); /* _MUST_ call rfc2863_policy() */ 192 189
+3
net/8021q/vlan_dev.c
··· 615 615 if (!vlan->vlan_pcpu_stats) 616 616 return -ENOMEM; 617 617 618 + /* Get vlan's reference to real_dev */ 619 + dev_hold(real_dev); 620 + 618 621 return 0; 619 622 } 620 623