diff options
author | Felix Fietkau <nbd@openwrt.org> | 2015-10-29 16:06:12 +0100 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2015-10-29 16:06:13 +0100 |
commit | fa64fe118945127007fc6f6f558d0630258790bd (patch) | |
tree | df7bcb973f22aef41f748b683b8e4a2ffd4ed7dd /system-linux.c | |
parent | bb99e8017b5b99e5ccd2c05c11b516b6e629ab20 (diff) |
system-linux: fix memory leak on error in system_if_check
Detected by Coverity CID 1330302
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Diffstat (limited to 'system-linux.c')
-rw-r--r-- | system-linux.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/system-linux.c b/system-linux.c index 27c0f1e..611acb8 100644 --- a/system-linux.c +++ b/system-linux.c @@ -1295,10 +1295,13 @@ int system_if_check(struct device *dev) int ret = 1; msg = nlmsg_alloc_simple(RTM_GETLINK, 0); - if (!msg || nlmsg_append(msg, &ifi, sizeof(ifi), 0) || - nla_put_string(msg, IFLA_IFNAME, dev->ifname)) + if (!msg) goto out; + if (nlmsg_append(msg, &ifi, sizeof(ifi), 0) || + nla_put_string(msg, IFLA_IFNAME, dev->ifname)) + goto free; + nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, cb_if_check_valid, &chk); nl_cb_set(cb, NL_CB_ACK, NL_CB_CUSTOM, cb_if_check_ack, &chk); nl_cb_err(cb, NL_CB_CUSTOM, cb_if_check_error, &chk); @@ -1307,9 +1310,10 @@ int system_if_check(struct device *dev) while (chk.pending > 0) nl_recvmsgs(sock_rtnl, cb); - nlmsg_free(msg); ret = chk.pending; +free: + nlmsg_free(msg); out: nl_cb_put(cb); return ret; |