Skip to content

Commit

Permalink
[VLAN]: Fix egress priority mappings leak.
Browse files Browse the repository at this point in the history
These entries are allocated in vlan_dev_set_egress_priority, 
but are never released and leaks on vlan device removal.

Drop these in vlan's ->uninit callback - after the device is 
brought down and everyone is notified about it is going to
be unregistered.

Found during testing vlan netnsization patchset.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Acked-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Pavel Emelyanov authored and David S. Miller committed Apr 4, 2008
1 parent b2a5c19 commit 2355632
Showing 1 changed file with 15 additions and 0 deletions.
15 changes: 15 additions & 0 deletions net/8021q/vlan_dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -692,6 +692,20 @@ static int vlan_dev_init(struct net_device *dev)
return 0;
}

static void vlan_dev_uninit(struct net_device *dev)
{
struct vlan_priority_tci_mapping *pm;
struct vlan_dev_info *vlan = vlan_dev_info(dev);
int i;

for (i = 0; i < ARRAY_SIZE(vlan->egress_priority_map); i++) {
while ((pm = vlan->egress_priority_map[i]) != NULL) {
vlan->egress_priority_map[i] = pm->next;
kfree(pm);
}
}
}

void vlan_setup(struct net_device *dev)
{
ether_setup(dev);
Expand All @@ -701,6 +715,7 @@ void vlan_setup(struct net_device *dev)

dev->change_mtu = vlan_dev_change_mtu;
dev->init = vlan_dev_init;
dev->uninit = vlan_dev_uninit;
dev->open = vlan_dev_open;
dev->stop = vlan_dev_stop;
dev->set_mac_address = vlan_dev_set_mac_address;
Expand Down

0 comments on commit 2355632

Please sign in to comment.