diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2012-01-28 13:52:37 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2012-01-28 13:52:37 +0000 |
| commit | b8d85a12121adf2bb2a637f86eb0def57b78791c (patch) | |
| tree | 6437a44ec74955df0f617cb8ef03afebd93bb9fb /package/switch/src/switch-core.c | |
| parent | c003d83f1ae5887b0e50ea7a2945f20044df1503 (diff) | |
| download | upstream-b8d85a12121adf2bb2a637f86eb0def57b78791c.tar.gz upstream-b8d85a12121adf2bb2a637f86eb0def57b78791c.tar.bz2 upstream-b8d85a12121adf2bb2a637f86eb0def57b78791c.zip | |
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 f5b248aadb..79b4e93f03 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; |