diff options
| author | Hans Dedecker <dedeckeh@gmail.com> | 2018-04-14 20:58:42 +0200 |
|---|---|---|
| committer | Hans Dedecker <dedeckeh@gmail.com> | 2018-04-14 21:00:44 +0200 |
| commit | 4a8e20e5aefc39bc1c9d37d07db8bda97251b4b9 (patch) | |
| tree | 93f6393985e1919567f10319d5c86ce9f40f6e84 | |
| parent | 36e4700668354d7c881b5e37f788cd3d21d02b47 (diff) | |
| download | netifd-4a8e20e5aefc39bc1c9d37d07db8bda97251b4b9.tar.gz | |
system-linux: fix segfault on error in system_add_ip6_tunnel()
Detected by Coverity in CID 1430884
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
| -rw-r--r-- | system-linux.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/system-linux.c b/system-linux.c index 3cdf3e4..b839b4c 100644 --- a/system-linux.c +++ b/system-linux.c @@ -2315,9 +2315,14 @@ static int system_add_ip6_tunnel(const char *name, const unsigned int link, #ifdef IFLA_IPTUN_FMR_MAX if ((cur = tb[TUNNEL_ATTR_DATA])) { - struct nlattr *fmrs = nla_nest_start(nlm, IFLA_IPTUN_FMRS); struct blob_attr *dcur; unsigned drem, fmrcnt = 0; + struct nlattr *fmrs = nla_nest_start(nlm, IFLA_IPTUN_FMRS); + + if (!fmrs) { + ret = -ENOMEM; + goto failure; + } blobmsg_for_each_attr(dcur, cur, drem) { if (blobmsg_type(dcur) != BLOBMSG_TYPE_ARRAY || @@ -2365,6 +2370,10 @@ static int system_add_ip6_tunnel(const char *name, const unsigned int link, offset = blobmsg_get_u32(tb_cur); struct nlattr *rule = nla_nest_start(nlm, ++fmrcnt); + if (!rule) { + ret = -ENOMEM; + goto failure; + } nla_put(nlm, IFLA_IPTUN_FMR_IP6_PREFIX, sizeof(ip6prefix), &ip6prefix); nla_put(nlm, IFLA_IPTUN_FMR_IP4_PREFIX, sizeof(ip4prefix), &ip4prefix); |