[PATCH AUTOSEL 5.3 66/71] nfp: abm: fix memory leak in nfp_abm_u32_knode_replace

[Sasha Levin]

From: Navid Emamdoost <navid.emamdo...@gmail.com>

[ Upstream commit 78beef629fd95be4ed853b2d37b832f766bd96ca ]

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.emamdo...@gmail.com>
Signed-off-by: David S. Miller <da...@davemloft.net>
Signed-off-by: Sasha Levin <sas...@kernel.org>
---
 drivers/net/ethernet/netronome/nfp/abm/cls.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/netronome/nfp/abm/cls.c 
b/drivers/net/ethernet/netronome/nfp/abm/cls.c
index 23ebddfb95325..9f8a1f69c0c4c 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.20.1