[net,1/1] net/mlx5: Avoid dereferencing uninitialized pointer

Message ID 20170328131341.11601-1-saeedm@mellanox.com
State Accepted
Delegated to: David Miller
Headers show

Commit Message

Saeed Mahameed March 28, 2017, 1:13 p.m.
From: Talat Batheesh <talatb@mellanox.com>

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@mellanox.com>
Reviewed-by: Aviv Heller <avivh@mellanox.com>
Reviewed-by: Moni Shoua <monis@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
---

Hi Dave,

I will appreciate it if you queue up this patch for v4.9-stable.

Thanks in advance,
Saeed.

 drivers/net/ethernet/mellanox/mlx5/core/lag.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

David Miller March 29, 2017, 1:07 a.m. | #1
From: Saeed Mahameed <saeedm@mellanox.com>
Date: Tue, 28 Mar 2017 16:13:41 +0300

> From: Talat Batheesh <talatb@mellanox.com>
> 
> 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@mellanox.com>
> Reviewed-by: Aviv Heller <avivh@mellanox.com>
> Reviewed-by: Moni Shoua <monis@mellanox.com>
> Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
> ---
> 
> Hi Dave,
> 
> I will appreciate it if you queue up this patch for v4.9-stable.

Applied and queued up for -stable, thanks.

Patch

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lag.c b/drivers/net/ethernet/mellanox/mlx5/core/lag.c
index 55957246c0e8..b5d5519542e8 100644
--- 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 mlx5_lag *ldev,
 					 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(struct mlx5_lag *ldev,
 	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