Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28343f8b authored by Cong Wang's avatar Cong Wang Committed by Greg Kroah-Hartman
Browse files

vlan: fix a use-after-free in vlan_device_event() 




[ Upstream commit 052d41c01b3a2e3371d66de569717353af489d63 ]

After refcnt reaches zero, vlan_vid_del() could free
dev->vlan_info via RCU:

	RCU_INIT_POINTER(dev->vlan_info, NULL);
	call_rcu(&vlan_info->rcu, vlan_info_rcu_free);

However, the pointer 'grp' still points to that memory
since it is set before vlan_vid_del():

        vlan_info = rtnl_dereference(dev->vlan_info);
        if (!vlan_info)
                goto out;
        grp = &vlan_info->grp;

Depends on when that RCU callback is scheduled, we could
trigger a use-after-free in vlan_group_for_each_dev()
right following this vlan_vid_del().

Fix it by moving vlan_vid_del() before setting grp. This
is also symmetric to the vlan_vid_add() we call in
vlan_device_event().

Reported-by: default avatarFengguang Wu <fengguang.wu@intel.com>
Fixes: efc73f4b ("net: Fix memory leak - vlan_info struct")
Cc: Alexander Duyck <alexander.duyck@gmail.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Girish Moodalbail <girish.moodalbail@oracle.com>
Signed-off-by: default avatarCong Wang <xiyou.wangcong@gmail.com>
Reviewed-by: default avatarGirish Moodalbail <girish.moodalbail@oracle.com>
Tested-by: default avatarFengguang Wu <fengguang.wu@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5c44a51d

net/8021q/vlan.c

+3 −3
Original line number Diff line number Diff line
@@ -376,6 +376,9 @@ static int vlan_device_event(struct notifier_block *unused, unsigned long event, 
			dev->name);

		vlan_vid_add(dev, htons(ETH_P_8021Q), 0);

	}

	if (event == NETDEV_DOWN &&

	    (dev->features & NETIF_F_HW_VLAN_CTAG_FILTER))

		vlan_vid_del(dev, htons(ETH_P_8021Q), 0);



	vlan_info = rtnl_dereference(dev->vlan_info);

	if (!vlan_info)
@@ -420,9 +423,6 @@ static int vlan_device_event(struct notifier_block *unused, unsigned long event, 
		break;



	case NETDEV_DOWN:

		if (dev->features & NETIF_F_HW_VLAN_CTAG_FILTER)

			vlan_vid_del(dev, htons(ETH_P_8021Q), 0);



		/* Put all VLANs for this dev in the down state too.  */

		vlan_group_for_each_dev(grp, i, vlandev) {

			flgs = vlandev->flags;