diff options
| author | Thomas Haller <thaller@redhat.com> | 2019-08-08 15:45:00 (GMT) |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2019-08-08 15:45:00 (GMT) |
| commit | 325d30403ad30ea6cd54d651ede9e11f14ae03cf (patch) | |
| tree | 591bfb5cc7efd959323241303f2eddcc61eb4d8a | |
| parent | fbf831fe474abc9d3c3880d22452bdfa2b3ddd81 (diff) | |
| parent | f1a085994a78a69abcd583d682b9850bc20ed482 (diff) | |
| download | libnl-325d30403ad30ea6cd54d651ede9e11f14ae03cf.zip libnl-325d30403ad30ea6cd54d651ede9e11f14ae03cf.tar.gz libnl-325d30403ad30ea6cd54d651ede9e11f14ae03cf.tar.bz2 | |
all: merge branch 'coverity-fixes'
https://bugzilla.redhat.com/show_bug.cgi?id=1606988
| -rw-r--r-- | lib/route/cls/ematch/text.c | 1 | ||||
| -rw-r--r-- | lib/route/link/sriov.c | 24 | ||||
| -rw-r--r-- | lib/xfrm/sa.c | 1 |
3 files changed, 20 insertions, 6 deletions
diff --git a/lib/route/cls/ematch/text.c b/lib/route/cls/ematch/text.c index b14c4ab..12a1e74 100644 --- a/lib/route/cls/ematch/text.c +++ b/lib/route/cls/ematch/text.c @@ -92,6 +92,7 @@ void rtnl_ematch_text_set_algo(struct rtnl_ematch *e, const char *algo) struct text_data *t = rtnl_ematch_data(e); strncpy(t->cfg.algo, algo, sizeof(t->cfg.algo)); + t->cfg.algo[sizeof(t->cfg.algo) - 1] = '\0'; } char *rtnl_ematch_text_get_algo(struct rtnl_ematch *e) diff --git a/lib/route/link/sriov.c b/lib/route/link/sriov.c index 5c20ecf..2a87cfe 100644 --- a/lib/route/link/sriov.c +++ b/lib/route/link/sriov.c @@ -109,8 +109,10 @@ int rtnl_link_sriov_clone(struct rtnl_link *dst, struct rtnl_link *src) { if (s_vf->ce_mask & SRIOV_ATTR_ADDR) { vf_addr = nl_addr_clone(s_vf->vf_lladdr); - if (!vf_addr) + if (!vf_addr) { + rtnl_link_vf_put(d_vf); return -NLE_NOMEM; + } d_vf->vf_lladdr = vf_addr; } @@ -120,8 +122,10 @@ int rtnl_link_sriov_clone(struct rtnl_link *dst, struct rtnl_link *src) { err = rtnl_link_vf_vlan_alloc(&dst_vlans, src_vlans->size); - if (err < 0) + if (err < 0) { + rtnl_link_vf_put(d_vf); return err; + } dst_vlan_info = dst_vlans->vlans; memcpy(dst_vlans, src_vlans, sizeof(nl_vf_vlans_t)); memcpy(dst_vlan_info, src_vlan_info, @@ -558,8 +562,10 @@ int rtnl_link_sriov_parse_vflist(struct rtnl_link *link, struct nlattr **tb) { vf_data->vf_lladdr = nl_addr_build(AF_LLC, vf_lladdr->mac, 6); - if (vf_data->vf_lladdr == NULL) + if (vf_data->vf_lladdr == NULL) { + rtnl_link_vf_put(vf_data); return -NLE_NOMEM; + } nl_addr_set_family(vf_data->vf_lladdr, AF_LLC); vf_data->ce_mask |= SRIOV_ATTR_ADDR; } @@ -576,8 +582,10 @@ int rtnl_link_sriov_parse_vflist(struct rtnl_link *link, struct nlattr **tb) { err = rtnl_link_vf_vlan_info(list_len, vf_vlan_info, &vf_vlans); - if (err < 0) + if (err < 0) { + rtnl_link_vf_put(vf_data); return err; + } vf_data->vf_vlans = vf_vlans; vf_data->ce_mask |= SRIOV_ATTR_VLAN; @@ -586,8 +594,10 @@ int rtnl_link_sriov_parse_vflist(struct rtnl_link *link, struct nlattr **tb) { if (vf_vlan->vlan) { err = rtnl_link_vf_vlan_alloc(&vf_vlans, 1); - if (err < 0) + if (err < 0) { + rtnl_link_vf_put(vf_data); return err; + } vf_vlans->vlans[0].vf_vlan = vf_vlan->vlan; vf_vlans->vlans[0].vf_vlan_qos = vf_vlan->qos; @@ -649,8 +659,10 @@ int rtnl_link_sriov_parse_vflist(struct rtnl_link *link, struct nlattr **tb) { err = nla_parse_nested(stb, IFLA_VF_STATS_MAX, t[IFLA_VF_STATS], sriov_stats_policy); - if (err < 0) + if (err < 0) { + rtnl_link_vf_put(vf_data); return err; + } SET_VF_STAT(link, cur, stb, RTNL_LINK_VF_STATS_RX_PACKETS, diff --git a/lib/xfrm/sa.c b/lib/xfrm/sa.c index 995df9f..15a3661 100644 --- a/lib/xfrm/sa.c +++ b/lib/xfrm/sa.c @@ -1190,6 +1190,7 @@ static int build_xfrm_sa_message(struct xfrmnl_sa *tmpl, int cmd, int flags, str } strncpy(auth->alg_name, tmpl->auth->alg_name, sizeof(auth->alg_name)); + auth->alg_name[sizeof(auth->alg_name) - 1] = '\0'; auth->alg_key_len = tmpl->auth->alg_key_len; memcpy(auth->alg_key, tmpl->auth->alg_key, (tmpl->auth->alg_key_len + 7) / 8); if (nla_put(msg, XFRMA_ALG_AUTH, len, auth) < 0) { |