Commit 78beef62 authored by Navid Emamdoost's avatar Navid Emamdoost Committed by David S. Miller

nfp: abm: fix memory leak in nfp_abm_u32_knode_replace

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: default avatarNavid Emamdoost <navid.emamdoost@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a41e8a88
...@@ -176,8 +176,10 @@ nfp_abm_u32_knode_replace(struct nfp_abm_link *alink, ...@@ -176,8 +176,10 @@ nfp_abm_u32_knode_replace(struct nfp_abm_link *alink,
u8 mask, val; u8 mask, val;
int err; 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; goto err_delete;
}
tos_off = proto == htons(ETH_P_IP) ? 16 : 20; tos_off = proto == htons(ETH_P_IP) ? 16 : 20;
...@@ -198,14 +200,18 @@ nfp_abm_u32_knode_replace(struct nfp_abm_link *alink, ...@@ -198,14 +200,18 @@ nfp_abm_u32_knode_replace(struct nfp_abm_link *alink,
if ((iter->val & cmask) == (val & cmask) && if ((iter->val & cmask) == (val & cmask) &&
iter->band != knode->res->classid) { iter->band != knode->res->classid) {
NL_SET_ERR_MSG_MOD(extack, "conflict with already offloaded filter"); NL_SET_ERR_MSG_MOD(extack, "conflict with already offloaded filter");
err = -EOPNOTSUPP;
goto err_delete; goto err_delete;
} }
} }
if (!match) { if (!match) {
match = kzalloc(sizeof(*match), GFP_KERNEL); match = kzalloc(sizeof(*match), GFP_KERNEL);
if (!match) if (!match) {
return -ENOMEM; err = -ENOMEM;
goto err_delete;
}
list_add(&match->list, &alink->dscp_map); list_add(&match->list, &alink->dscp_map);
} }
match->handle = knode->handle; match->handle = knode->handle;
...@@ -221,7 +227,7 @@ nfp_abm_u32_knode_replace(struct nfp_abm_link *alink, ...@@ -221,7 +227,7 @@ nfp_abm_u32_knode_replace(struct nfp_abm_link *alink,
err_delete: err_delete:
nfp_abm_u32_knode_delete(alink, knode); nfp_abm_u32_knode_delete(alink, knode);
return -EOPNOTSUPP; return err;
} }
static int nfp_abm_setup_tc_block_cb(enum tc_setup_type type, static int nfp_abm_setup_tc_block_cb(enum tc_setup_type type,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment