* [PATCH v2] lag_conf: Added pointer check and continue
@ 2022-11-16 8:13 Denis Arefev
2022-11-16 9:39 ` Simon Horman
0 siblings, 1 reply; 4+ messages in thread
From: Denis Arefev @ 2022-11-16 8:13 UTC (permalink / raw)
To: Simon Horman
Cc: Jakub Kicinski, David S. Miller, oss-drivers, netdev,
linux-kernel, lvc-patchest, trufanov, vfh
Return value of a function 'kmalloc_array' is dereferenced at
lag_conf.c:347 without checking for null,
but it is usually checked for this function.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
Signed-off-by: Denis Arefev <arefev@swemel.ru>
---
drivers/net/ethernet/netronome/nfp/flower/lag_conf.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/netronome/nfp/flower/lag_conf.c b/drivers/net/ethernet/netronome/nfp/flower/lag_conf.c
index 63907aeb3884..1aaec4cb9f55 100644
--- a/drivers/net/ethernet/netronome/nfp/flower/lag_conf.c
+++ b/drivers/net/ethernet/netronome/nfp/flower/lag_conf.c
@@ -276,7 +276,7 @@ static void nfp_fl_lag_do_work(struct work_struct *work)
mutex_lock(&lag->lock);
list_for_each_entry_safe(entry, storage, &lag->group_list, list) {
- struct net_device *iter_netdev, **acti_netdevs;
+ struct net_device *iter_netdev, **acti_netdevs = NULL;
struct nfp_flower_repr_priv *repr_priv;
int active_count = 0, slaves = 0;
struct nfp_repr *repr;
@@ -308,6 +308,10 @@ static void nfp_fl_lag_do_work(struct work_struct *work)
acti_netdevs = kmalloc_array(entry->slave_cnt,
sizeof(*acti_netdevs), GFP_KERNEL);
+ if (!acti_netdevs) {
+ schedule_delayed_work(&lag->work, NFP_FL_LAG_DELAY);
+ continue;
+ }
/* Include sanity check in the loop. It may be that a bond has
* changed between processing the last notification and the
--
2.25.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2] lag_conf: Added pointer check and continue
2022-11-16 8:13 [PATCH v2] lag_conf: Added pointer check and continue Denis Arefev
@ 2022-11-16 9:39 ` Simon Horman
2022-11-16 10:35 ` Simon Horman
2022-11-18 3:47 ` Jakub Kicinski
0 siblings, 2 replies; 4+ messages in thread
From: Simon Horman @ 2022-11-16 9:39 UTC (permalink / raw)
To: Denis Arefev
Cc: Simon Horman, Jakub Kicinski, David S. Miller, oss-drivers,
netdev, linux-kernel, lvc-patchest, trufanov, vfh, Yinjun Zhang
On Wed, Nov 16, 2022 at 11:13:36AM +0300, Denis Arefev wrote:
> Return value of a function 'kmalloc_array' is dereferenced at
> lag_conf.c:347 without checking for null,
> but it is usually checked for this function.
>
> Found by Linux Verification Center (linuxtesting.org) with SVACE.
>
> Signed-off-by: Denis Arefev <arefev@swemel.ru>
Thanks Denis,
I'll let me colleague Yinjun review the functional change,
although, based on his earlier feedback, it does look good to me.
From my side I have two nits:
1. I think the patch prefix should be 'nfp: flower:'
i.e., the patch subject should be more like
[PATCH v2] nfp: flower: handle allocation failure in LAG delayed work
2. Inline, below.
Kind regards,
Simon
> diff --git a/drivers/net/ethernet/netronome/nfp/flower/lag_conf.c b/drivers/net/ethernet/netronome/nfp/flower/lag_conf.c
> index 63907aeb3884..1aaec4cb9f55 100644
> --- a/drivers/net/ethernet/netronome/nfp/flower/lag_conf.c
> +++ b/drivers/net/ethernet/netronome/nfp/flower/lag_conf.c
> @@ -276,7 +276,7 @@ static void nfp_fl_lag_do_work(struct work_struct *work)
>
> mutex_lock(&lag->lock);
> list_for_each_entry_safe(entry, storage, &lag->group_list, list) {
> - struct net_device *iter_netdev, **acti_netdevs;
> + struct net_device *iter_netdev, **acti_netdevs = NULL;
2. I don't think it is necessary (or therefore desirable)
to initialise acti_netdevs to NULL.
As far as I can tell the variable is already always
set before being used.
...
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] lag_conf: Added pointer check and continue
2022-11-16 9:39 ` Simon Horman
@ 2022-11-16 10:35 ` Simon Horman
2022-11-18 3:47 ` Jakub Kicinski
1 sibling, 0 replies; 4+ messages in thread
From: Simon Horman @ 2022-11-16 10:35 UTC (permalink / raw)
To: Denis Arefev
Cc: Simon Horman, Jakub Kicinski, David S. Miller, oss-drivers,
netdev, linux-kernel, lvc-patchest, trufanov, vfh, Yinjun Zhang
On Wed, Nov 16, 2022 at 10:40:00AM +0100, Simon Horman wrote:
> On Wed, Nov 16, 2022 at 11:13:36AM +0300, Denis Arefev wrote:
> > Return value of a function 'kmalloc_array' is dereferenced at
> > lag_conf.c:347 without checking for null,
> > but it is usually checked for this function.
> >
> > Found by Linux Verification Center (linuxtesting.org) with SVACE.
> >
> > Signed-off-by: Denis Arefev <arefev@swemel.ru>
>
> Thanks Denis,
>
> I'll let me colleague Yinjun review the functional change,
> although, based on his earlier feedback, it does look good to me.
I confirmed with Yinjun that he is happy with the patch,
other than the comments that I made.
> From my side I have two nits:
>
> 1. I think the patch prefix should be 'nfp: flower:'
> i.e., the patch subject should be more like
> [PATCH v2] nfp: flower: handle allocation failure in LAG delayed work
>
> 2. Inline, below.
>
> Kind regards,
> Simon
>
> > diff --git a/drivers/net/ethernet/netronome/nfp/flower/lag_conf.c b/drivers/net/ethernet/netronome/nfp/flower/lag_conf.c
> > index 63907aeb3884..1aaec4cb9f55 100644
> > --- a/drivers/net/ethernet/netronome/nfp/flower/lag_conf.c
> > +++ b/drivers/net/ethernet/netronome/nfp/flower/lag_conf.c
> > @@ -276,7 +276,7 @@ static void nfp_fl_lag_do_work(struct work_struct *work)
> >
> > mutex_lock(&lag->lock);
> > list_for_each_entry_safe(entry, storage, &lag->group_list, list) {
> > - struct net_device *iter_netdev, **acti_netdevs;
> > + struct net_device *iter_netdev, **acti_netdevs = NULL;
>
> 2. I don't think it is necessary (or therefore desirable)
> to initialise acti_netdevs to NULL.
> As far as I can tell the variable is already always
> set before being used.
>
> ...
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] lag_conf: Added pointer check and continue
2022-11-16 9:39 ` Simon Horman
2022-11-16 10:35 ` Simon Horman
@ 2022-11-18 3:47 ` Jakub Kicinski
1 sibling, 0 replies; 4+ messages in thread
From: Jakub Kicinski @ 2022-11-18 3:47 UTC (permalink / raw)
To: Denis Arefev
Cc: Simon Horman, Simon Horman, David S. Miller, oss-drivers, netdev,
linux-kernel, lvc-patchest, trufanov, vfh, Yinjun Zhang
On Wed, 16 Nov 2022 10:39:54 +0100 Simon Horman wrote:
> 1. I think the patch prefix should be 'nfp: flower:'
> i.e., the patch subject should be more like
> [PATCH v2] nfp: flower: handle allocation failure in LAG delayed work
One more note here, please add the tree name to the prefix:
[PATCH net v2] ...
and a fixes tag right above the sign-off:
Fixes: bb9a8d031140 ("nfp: flower: monitor and offload LAG groups")
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-11-18 3:47 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-16 8:13 [PATCH v2] lag_conf: Added pointer check and continue Denis Arefev
2022-11-16 9:39 ` Simon Horman
2022-11-16 10:35 ` Simon Horman
2022-11-18 3:47 ` Jakub Kicinski
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.