[PATCH 4.9 09/54] net/mlx5: Avoid dereferencing uninitialized pointer

From: Greg Kroah-Hartman
Date: Mon May 01 2017 - 17:52:05 EST


4.9-stable review patch. If anyone has any objections, please let me know.

------------------

From: Talat Batheesh <talatb@xxxxxxxxxxxx>


[ Upstream commit e497ec680c4cd51e76bfcdd49363d9ab8d32a757 ]

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

Fixes: 7907f23adc18 (net/mlx5: Implement RoCE LAG feature)
Signed-off-by: Talat Batheesh <talatb@xxxxxxxxxxxx>
Reviewed-by: Aviv Heller <avivh@xxxxxxxxxxxx>
Reviewed-by: Moni Shoua <monis@xxxxxxxxxxxx>
Signed-off-by: Saeed Mahameed <saeedm@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/net/ethernet/mellanox/mlx5/core/lag.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

--- a/drivers/net/ethernet/mellanox/mlx5/core/lag.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/lag.c
@@ -294,7 +294,7 @@ static int mlx5_handle_changeupper_event
struct netdev_notifier_changeupper_info *info)
{
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;
int bond_status = 0;
int num_slaves = 0;
@@ -303,7 +303,8 @@ static int mlx5_handle_changeupper_event
if (!netif_is_lag_master(upper))
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
* us, but is enslaved to a master which has one or more of our netdevs