summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2007-09-17 01:43:04 +0200
committerDavid S. Miller <davem@davemloft.net>2007-09-17 01:43:04 +0200
commitd9f30ec0b0d129b9cbf2b041a6a3159aa24592f6 (patch)
tree325c2d1550ed02e3c652625bb6c9371589af13ff
parent[PPP] generic: Fix receive path data clobbering & non-linear handling (diff)
downloadlinux-d9f30ec0b0d129b9cbf2b041a6a3159aa24592f6.tar.xz
linux-d9f30ec0b0d129b9cbf2b041a6a3159aa24592f6.zip
[VLAN]: Fix net_device leak.
In "[VLAN]: Move device registation to seperate function" (commit e89fe42cd03c8fd3686df82d8390a235717a66de), a pile of code got moved to register_vlan_dev(), including grabbing a reference to underlying device. However, original dev_hold() had been left behind, so we leak a reference to net_device now... Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/8021q/vlan.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
index 1583c5ef963f..2a546919d6fb 100644
--- a/net/8021q/vlan.c
+++ b/net/8021q/vlan.c
@@ -562,8 +562,6 @@ static int register_vlan_device(struct net_device *real_dev,
if (err < 0)
goto out_free_newdev;
- /* Account for reference in struct vlan_dev_info */
- dev_hold(real_dev);
#ifdef VLAN_DEBUG
printk(VLAN_DBG "Allocated new device successfully, returning.\n");
#endif