diff options
| author | Arne Redlich <readlicha@sphairon.com> | 2009-06-29 16:43:27 +0100 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2009-07-20 00:22:05 +0200 |
| commit | 47dfbbdf8b64afbe30636b2b810ef9d436194584 (patch) | |
| tree | 8a543fa9125aae52f472494692147078f27f6f60 | |
| parent | f249e9626f108001cca338975e5b4b0a4a57ccff (diff) | |
| download | linux-2.4-47dfbbdf8b64afbe30636b2b810ef9d436194584.tar.gz | |
vlan: Slab memleak fix
Fix slab memleak on wan service restart
Signed-off-by: Arne Redlich <redlicha@sphairon.com>
Signed-off-by: Frank Seidel <Frank.Seidel@sphairon.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Willy Tarreau <w@1wt.eu>
| -rw-r--r-- | net/8021q/vlan_dev.c | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index 8a17083e0ec434..64b0c7914d9fee 100644 --- a/net/8021q/vlan_dev.c +++ b/net/8021q/vlan_dev.c @@ -548,6 +548,22 @@ int vlan_dev_set_ingress_priority(char *dev_name, __u32 skb_prio, short vlan_pri return -EINVAL; } +/* Remove all egress_priority_map hash table entries. --redlicha */ +static void vlan_dev_destroy_egress_priority_map(struct net_device *dev) +{ + struct vlan_dev_info *info = VLAN_DEV_INFO(dev); + struct vlan_priority_tci_mapping *m; + int i; + + for (i = 0; i < ARRAY_SIZE(info->egress_priority_map); i++) { + while ((m = info->egress_priority_map[i])) { + info->egress_priority_map[i] = + info->egress_priority_map[i]->next; + kfree(m); + } + } +} + int vlan_dev_set_egress_priority(char *dev_name, __u32 skb_prio, short vlan_prio) { struct net_device *dev = dev_get_by_name(dev_name); @@ -826,7 +842,11 @@ void vlan_dev_destruct(struct net_device *dev) if (dev->priv) { if (VLAN_DEV_INFO(dev)->dent) BUG(); - + /* + * Don't leak the hash table entries in + * VLAN_DEV_INFO(dev)->egress_priority_map! --redlicha + */ + vlan_dev_destroy_egress_priority_map(dev); kfree(dev->priv); dev->priv = NULL; } |