diff options
author | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-01-28 13:52:37 +0000 |
---|---|---|
committer | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-01-28 13:52:37 +0000 |
commit | 8bf9a785b171d1398cbd2ab12041733d0ba2df94 (patch) | |
tree | 6437a44ec74955df0f617cb8ef03afebd93bb9fb /package/switch/src/switch-core.c | |
parent | ebbec463c78aa5c4450a4e6be9ed1207f662e4ec (diff) |
switch: fix some memory leaks in switch_parse_vlan()
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29936 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/switch/src/switch-core.c')
-rw-r--r-- | package/switch/src/switch-core.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/package/switch/src/switch-core.c b/package/switch/src/switch-core.c index f5b248aad..79b4e93f0 100644 --- a/package/switch/src/switch-core.c +++ b/package/switch/src/switch-core.c @@ -341,10 +341,9 @@ switch_vlan_config *switch_parse_vlan(switch_driver *driver, char *buf) switch_vlan_config *c; int j, u, p, s; - c = kmalloc(sizeof(switch_vlan_config), GFP_KERNEL); + c = kzalloc(sizeof(switch_vlan_config), GFP_KERNEL); if (!c) return NULL; - memset(c, 0, sizeof(switch_vlan_config)); while (isspace(*buf)) buf++; j = 0; @@ -382,7 +381,10 @@ switch_vlan_config *switch_parse_vlan(switch_driver *driver, char *buf) while (isspace(*buf)) buf++; } - if (*buf != 0) return NULL; + if (*buf != 0) { + kfree(c); + return NULL; + } c->port &= (1 << driver->ports) - 1; c->untag &= (1 << driver->ports) - 1; |