summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-04-17 09:50:59 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-04-25 21:23:47 -0700
commit80d98a915c07e6de6c3a2c08dea843f441273081 (patch)
tree32e2a76b76dd9d4f703eea779bf37d4dff461be7 /net
parent27819a8a40b34b2db511181cfbfdf7f76281651d (diff)
Revert "8021q: fix a potential use-after-free"
This reverts commit 9829fe9806e22d7a822f4c947cc432c8d1774b54 which is upstream commit 4a7df340ed1bac190c124c1601bfc10cde9fb4fb It turns out this causes problems on the 3.0-stable release. Reported-by: Thomas Voegtle <tv@lio96.de> Acked-by: Cong Wang <amwang@redhat.com> Cc: Patrick McHardy <kaber@trash.net> Cc: "David S. Miller" <davem@davemloft.net> Cc: Eric Dumazet <edumazet@google.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
-rw-r--r--net/8021q/vlan.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
index 1e93a917b3df..917ecb93ea28 100644
--- a/net/8021q/vlan.c
+++ b/net/8021q/vlan.c
@@ -108,6 +108,13 @@ void unregister_vlan_dev(struct net_device *dev, struct list_head *head)
grp = rtnl_dereference(real_dev->vlgrp);
BUG_ON(!grp);
+ /* Take it out of our own structures, but be sure to interlock with
+ * HW accelerating devices or SW vlan input packet processing if
+ * VLAN is not 0 (leave it there for 802.1p).
+ */
+ if (vlan_id && (real_dev->features & NETIF_F_HW_VLAN_FILTER))
+ ops->ndo_vlan_rx_kill_vid(real_dev, vlan_id);
+
grp->nr_vlans--;
if (vlan->flags & VLAN_FLAG_GVRP)
@@ -132,13 +139,6 @@ void unregister_vlan_dev(struct net_device *dev, struct list_head *head)
call_rcu(&grp->rcu, vlan_rcu_free);
}
- /* Take it out of our own structures, but be sure to interlock with
- * HW accelerating devices or SW vlan input packet processing if
- * VLAN is not 0 (leave it there for 802.1p).
- */
- if (vlan_id && (real_dev->features & NETIF_F_HW_VLAN_FILTER))
- ops->ndo_vlan_rx_kill_vid(real_dev, vlan_id);
-
/* Get rid of the vlan's reference to real_dev */
dev_put(real_dev);
}