From: Navid Emamdoost <navid.emamdoost@gmail.com>
To: Jakub Kicinski <jakub.kicinski@netronome.com>
Cc: emamd001@umn.edu, smccaman@umn.edu, kjlu@umn.edu,
"David S. Miller" <davem@davemloft.net>,
Pablo Neira Ayuso <pablo@netfilter.org>,
John Hurley <john.hurley@netronome.com>,
Colin Ian King <colin.king@canonical.com>,
oss-drivers@netronome.com, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2] net: flow_offload: fix memory leak in nfp_abm_u32_knode_replace
Date: Thu, 26 Sep 2019 21:26:47 -0500 [thread overview]
Message-ID: <20190927022647.GC22969@cs-dulles.cs.umn.edu> (raw)
In-Reply-To: <20190925215314.10cf291d@cakuba.netronome.com>
On Wed, Sep 25, 2019 at 09:53:14PM -0700, Jakub Kicinski wrote:
> On Wed, 25 Sep 2019 21:22:35 -0500, Navid Emamdoost wrote:
> > 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>
> > ---
> > Changes in v2:
> > - Reused err variable for erorr value returning.
>
> Thanks, there's another goto up top. And I think subject prefix could
> be "nfp: abm:", perhaps?
>
Thanks, v3 was sent which fixes this.
Navid.
> > drivers/net/ethernet/netronome/nfp/abm/cls.c | 10 +++++++---
> > 1 file changed, 7 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/net/ethernet/netronome/nfp/abm/cls.c b/drivers/net/ethernet/netronome/nfp/abm/cls.c
> > index 23ebddfb9532..b0cb9d201f7d 100644
> > --- a/drivers/net/ethernet/netronome/nfp/abm/cls.c
> > +++ b/drivers/net/ethernet/netronome/nfp/abm/cls.c
> > @@ -198,14 +198,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 +225,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,
>
prev parent reply other threads:[~2019-09-27 2:26 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-25 18:34 [PATCH] net: flow_offload: fix memory leak in nfp_abm_u32_knode_replace Navid Emamdoost
2019-09-26 1:28 ` 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 ` Navid Emamdoost [this message]
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=20190927022647.GC22969@cs-dulles.cs.umn.edu \
--to=navid.emamdoost@gmail.com \
--cc=colin.king@canonical.com \
--cc=davem@davemloft.net \
--cc=emamd001@umn.edu \
--cc=jakub.kicinski@netronome.com \
--cc=john.hurley@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).