aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2012-01-12 10:15:18 +0000
committerFelix Fietkau <nbd@openwrt.org>2012-01-12 10:15:18 +0000
commitbe4852ef3f654898866d2c47f98d3c03ab5fde95 (patch)
tree9f795a978ed1848191dee516223e5b5dd7b75a94
parent15d2a217020750edd08d94724278a81bb300deaf (diff)
downloadupstream-be4852ef3f654898866d2c47f98d3c03ab5fde95.tar.gz
upstream-be4852ef3f654898866d2c47f98d3c03ab5fde95.tar.bz2
upstream-be4852ef3f654898866d2c47f98d3c03ab5fde95.zip
libnl-tiny: fix a potential memleak in an error path
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29720 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/libnl-tiny/src/unl.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/package/libnl-tiny/src/unl.c b/package/libnl-tiny/src/unl.c
index 4eb7dc07fd..71487e0c10 100644
--- a/package/libnl-tiny/src/unl.c
+++ b/package/libnl-tiny/src/unl.c
@@ -191,11 +191,11 @@ static int unl_genl_multicast_id(struct unl *unl, const char *name)
NLA_PUT_STRING(msg, CTRL_ATTR_FAMILY_NAME, unl->family_name);
unl_genl_request_single(unl, msg, &msg);
if (!msg)
- goto nla_put_failure;
+ return -1;
groups = unl_find_attr(unl, msg, CTRL_ATTR_MCAST_GROUPS);
if (!groups)
- goto fail;
+ goto nla_put_failure;
nla_for_each_nested(group, groups, rem) {
const char *gn;
@@ -215,9 +215,8 @@ static int unl_genl_multicast_id(struct unl *unl, const char *name)
break;
}
-fail:
- nlmsg_free(msg);
nla_put_failure:
+ nlmsg_free(msg);
return ret;
}