Commit 6a47cdc3 authored by Xin Long's avatar Xin Long Committed by Jakub Kicinski
Browse files

Revert "vlan: move dev_put into vlan_dev_uninit" 



This reverts commit d6ff94af.

Since commit faab39f6 ("net: allow out-of-order netdev unregistration")
fixed the issue in a better way, this patch is to revert the previous fix,
as it might bring back the old problem fixed by commit 563bcbae ("net:
vlan: fix a UAF in vlan_dev_real_dev()").

Signed-off-by: default avatarXin Long <lucien.xin@gmail.com>
Link: https://lore.kernel.org/r/563c0a6e48510ccbff9ef4715de37209695e9fc4.1645592097.git.lucien.xin@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 167053f8

net/8021q/vlan_dev.c

+3 −5
Original line number Diff line number Diff line
@@ -638,12 +638,7 @@ void vlan_dev_free_egress_priority(const struct net_device *dev) 


static void vlan_dev_uninit(struct net_device *dev)

{

	struct vlan_dev_priv *vlan = vlan_dev_priv(dev);



	vlan_dev_free_egress_priority(dev);



	/* Get rid of the vlan's reference to real_dev */

	dev_put_track(vlan->real_dev, &vlan->dev_tracker);

}



static netdev_features_t vlan_dev_fix_features(struct net_device *dev,
@@ -856,6 +851,9 @@ static void vlan_dev_free(struct net_device *dev) 


	free_percpu(vlan->vlan_pcpu_stats);

	vlan->vlan_pcpu_stats = NULL;



	/* Get rid of the vlan's reference to real_dev */

	dev_put_track(vlan->real_dev, &vlan->dev_tracker);

}



void vlan_setup(struct net_device *dev)