[PATCH net-next] Revert "vlan: move dev_put into vlan_dev_uninit"

[PATCH net-next] Revert "vlan: move dev_put into vlan_dev_uninit"

[Xin Long]

This reverts commit d6ff94afd90b0ce8d1715f8ef77d4347d7a7f2c0.

Since commit faab39f63c1f ("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 563bcbae3ba2 ("net:
vlan: fix a UAF in vlan_dev_real_dev()").

Signed-off-by: Xin Long <lucien.xin@gmail.com>
---
 net/8021q/vlan_dev.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index d1902828a18a..e5d23e75572a 100644
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
@@ -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)
-- 
2.31.1

Re: [PATCH net-next] Revert "vlan: move dev_put into vlan_dev_uninit"

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to netdev/net-next.git (master)
by Jakub Kicinski <kuba@kernel.org>:

On Tue, 22 Feb 2022 23:54:57 -0500 you wrote:
> This reverts commit d6ff94afd90b0ce8d1715f8ef77d4347d7a7f2c0.
> 
> Since commit faab39f63c1f ("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 563bcbae3ba2 ("net:
> vlan: fix a UAF in vlan_dev_real_dev()").
> 
> [...]

Here is the summary with links:
  - [net-next] Revert "vlan: move dev_put into vlan_dev_uninit"
    https://git.kernel.org/netdev/net-next/c/6a47cdc38143

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html