| Message ID | 20190926022240.3789-1-navid.emamdoost@gmail.com |
|---|---|
| State | Superseded |
| Delegated to: | David Miller |
| Headers | show |
| Series | [v2] net: flow_offload: fix memory leak in nfp_abm_u32_knode_replace | expand |
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? > 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,
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, >
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,
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. --- drivers/net/ethernet/netronome/nfp/abm/cls.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)