Skip to content

Commit

Permalink
nfp: abm: fix memory leak in nfp_abm_u32_knode_replace
Browse files Browse the repository at this point in the history
In nfp_abm_u32_knode_replace if the allocation for match fails it should
go to the error handling instead of returning. Updated other gotos to
have correct errno returned, too.

Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Navid Emamdoost authored and David S. Miller committed Sep 27, 2019
1 parent a41e8a8 commit 78beef6
Showing 1 changed file with 10 additions and 4 deletions.
14 changes: 10 additions & 4 deletions drivers/net/ethernet/netronome/nfp/abm/cls.c
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,10 @@ nfp_abm_u32_knode_replace(struct nfp_abm_link *alink,
u8 mask, val;
int err;

if (!nfp_abm_u32_check_knode(alink->abm, knode, proto, extack))
if (!nfp_abm_u32_check_knode(alink->abm, knode, proto, extack)) {
err = -EOPNOTSUPP;
goto err_delete;
}

tos_off = proto == htons(ETH_P_IP) ? 16 : 20;

Expand All @@ -198,14 +200,18 @@ nfp_abm_u32_knode_replace(struct nfp_abm_link *alink,
if ((iter->val & cmask) == (val & cmask) &&
iter->band != knode->res->classid) {
NL_SET_ERR_MSG_MOD(extack, "conflict with already offloaded filter");
err = -EOPNOTSUPP;
goto err_delete;
}
}

if (!match) {
match = kzalloc(sizeof(*match), GFP_KERNEL);
if (!match)
return -ENOMEM;
if (!match) {
err = -ENOMEM;
goto err_delete;
}

list_add(&match->list, &alink->dscp_map);
}
match->handle = knode->handle;
Expand All @@ -221,7 +227,7 @@ nfp_abm_u32_knode_replace(struct nfp_abm_link *alink,

err_delete:
nfp_abm_u32_knode_delete(alink, knode);
return -EOPNOTSUPP;
return err;
}

static int nfp_abm_setup_tc_block_cb(enum tc_setup_type type,
Expand Down

0 comments on commit 78beef6

Please sign in to comment.