UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "nfp: abm: fix memory leak in nfp_abm_u32_knode_replace" 

This reverts commit 78beef629f ("nfp: abm: fix memory leak in
nfp_abm_u32_knode_replace").

The quoted commit does not fix anything and resulted in a bogus
CVE-2019-19076.

If match is NULL then it is known there is no matching entry in
list, hence, calling nfp_abm_u32_knode_delete() is pointless.

Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: John Hurley <john.hurley@netronome.com>
This commit is contained in:
Jakub Kicinski 2019-12-10 10:20:32 -08:00
parent 1f4782ae24
commit 1d1997db87
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/net/ethernet/netronome/nfp/abm/cls.c
View File

@ -176,10 +176,8 @@ 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;
@ -200,18 +198,14 @@ 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)
err = -ENOMEM; return -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;
@ -227,7 +221,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 err; return -EOPNOTSUPP;
} }
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,