From: Navid Emamdoost <navid.emamdoost@gmail.com>
To: unlisted-recipients:; (no To-header on input)
Cc: emamd001@umn.edu, smccaman@umn.edu, kjlu@umn.edu,
Navid Emamdoost <navid.emamdoost@gmail.com>,
Jakub Kicinski <jakub.kicinski@netronome.com>,
"David S. Miller" <davem@davemloft.net>,
Pablo Neira Ayuso <pablo@netfilter.org>,
Colin Ian King <colin.king@canonical.com>,
oss-drivers@netronome.com, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH] net: flow_offload: fix memory leak in nfp_abm_u32_knode_replace
Date: Wed, 25 Sep 2019 13:34:46 -0500 [thread overview]
Message-ID: <20190925183457.32695-1-navid.emamdoost@gmail.com> (raw)
In nfp_abm_u32_knode_replace if the allocation for match fails it should
go to the error handling instead of returning.
Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com>
---
drivers/net/ethernet/netronome/nfp/abm/cls.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/netronome/nfp/abm/cls.c b/drivers/net/ethernet/netronome/nfp/abm/cls.c
index 23ebddfb9532..32eaab99d96c 100644
--- a/drivers/net/ethernet/netronome/nfp/abm/cls.c
+++ b/drivers/net/ethernet/netronome/nfp/abm/cls.c
@@ -174,7 +174,7 @@ nfp_abm_u32_knode_replace(struct nfp_abm_link *alink,
struct nfp_abm_u32_match *match = NULL, *iter;
unsigned int tos_off;
u8 mask, val;
- int err;
+ int err, ret = -EOPNOTSUPP;
if (!nfp_abm_u32_check_knode(alink->abm, knode, proto, extack))
goto err_delete;
@@ -204,8 +204,11 @@ nfp_abm_u32_knode_replace(struct nfp_abm_link *alink,
if (!match) {
match = kzalloc(sizeof(*match), GFP_KERNEL);
- if (!match)
- return -ENOMEM;
+ if (!match) {
+ ret = -ENOMEM;
+ goto err_delete;
+ }
+
list_add(&match->list, &alink->dscp_map);
}
match->handle = knode->handle;
@@ -221,7 +224,7 @@ nfp_abm_u32_knode_replace(struct nfp_abm_link *alink,
err_delete:
nfp_abm_u32_knode_delete(alink, knode);
- return -EOPNOTSUPP;
+ return ret;
}
static int nfp_abm_setup_tc_block_cb(enum tc_setup_type type,
--
2.17.1
next reply other threads:[~2019-09-25 18:35 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-25 18:34 Navid Emamdoost [this message]
2019-09-26 1:28 ` [PATCH] net: flow_offload: fix memory leak in nfp_abm_u32_knode_replace Jakub Kicinski
2019-09-26 2:22 ` [PATCH v2] " Navid Emamdoost
2019-09-26 4:53 ` Jakub Kicinski
2019-09-27 1:51 ` [PATCH v3] nfp: abm: " Navid Emamdoost
2019-09-27 12:12 ` Markus Elfring
2019-09-27 21:42 ` Jakub Kicinski
2019-09-28 5:55 ` Markus Elfring
2019-09-27 18:56 ` [PATCH v3] " David Miller
2019-12-04 18:39 ` Jakub Kicinski
2019-09-27 2:26 ` [PATCH v2] net: flow_offload: " Navid Emamdoost
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190925183457.32695-1-navid.emamdoost@gmail.com \
--to=navid.emamdoost@gmail.com \
--cc=colin.king@canonical.com \
--cc=davem@davemloft.net \
--cc=emamd001@umn.edu \
--cc=jakub.kicinski@netronome.com \
--cc=kjlu@umn.edu \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=oss-drivers@netronome.com \
--cc=pablo@netfilter.org \
--cc=smccaman@umn.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).