| From dd88c52785c6c1a57d4c8011ef6f51cd0e3efa30 Mon Sep 17 00:00:00 2001 |
| From: Navid Emamdoost <navid.emamdoost@gmail.com> |
| Date: Thu, 26 Sep 2019 20:51:46 -0500 |
| Subject: [PATCH] nfp: abm: fix memory leak in nfp_abm_u32_knode_replace |
| |
| commit 78beef629fd95be4ed853b2d37b832f766bd96ca upstream. |
| |
| 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> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/net/ethernet/netronome/nfp/abm/cls.c b/drivers/net/ethernet/netronome/nfp/abm/cls.c |
| index ff3913085665..39be107fbccc 100644 |
| --- a/drivers/net/ethernet/netronome/nfp/abm/cls.c |
| +++ b/drivers/net/ethernet/netronome/nfp/abm/cls.c |
| @@ -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; |
| |
| @@ -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; |
| @@ -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, |
| -- |
| 2.7.4 |
| |