hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

net/mlx5: Avoid dereferencing uninitialized pointer 

In NETDEV_CHANGEUPPER event the upper_info field is valid
only when linking is true. Otherwise it should be ignored.

Fixes: 7907f23adc (net/mlx5: Implement RoCE LAG feature)
Signed-off-by: Talat Batheesh <talatb@mellanox.com>
Reviewed-by: Aviv Heller <avivh@mellanox.com>
Reviewed-by: Moni Shoua <monis@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Talat Batheesh 2017-03-28 16:13:41 +03:00 committed by David S. Miller
parent c2b341a620
commit e497ec680c
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/ethernet/mellanox/mlx5/core/lag.c
View File

@ -294,7 +294,7 @@ static int mlx5_handle_changeupper_event(struct mlx5_lag *ldev,
struct netdev_notifier_changeupper_info *info) struct netdev_notifier_changeupper_info *info)
{ {
struct net_device *upper = info->upper_dev, *ndev_tmp; struct net_device *upper = info->upper_dev, *ndev_tmp;
struct netdev_lag_upper_info *lag_upper_info; struct netdev_lag_upper_info *lag_upper_info = NULL;
bool is_bonded; bool is_bonded;
int bond_status = 0; int bond_status = 0;
int num_slaves = 0; int num_slaves = 0;
@ -303,7 +303,8 @@ static int mlx5_handle_changeupper_event(struct mlx5_lag *ldev,
if (!netif_is_lag_master(upper)) if (!netif_is_lag_master(upper))
return 0; return 0;
lag_upper_info = info->upper_info; if (info->linking)
lag_upper_info = info->upper_info;
/* The event may still be of interest if the slave does not belong to /* The event may still be of interest if the slave does not belong to
* us, but is enslaved to a master which has one or more of our netdevs * us, but is enslaved to a master which has one or more of our netdevs