Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 501299e6 authored by Talat Batheesh's avatar Talat Batheesh Committed by Greg Kroah-Hartman
Browse files

net/mlx5: Avoid dereferencing uninitialized pointer 



[ Upstream commit e497ec680c4cd51e76bfcdd49363d9ab8d32a757 ]

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

Fixes: 7907f23a (net/mlx5: Implement RoCE LAG feature)
Signed-off-by: default avatarTalat Batheesh <talatb@mellanox.com>
Reviewed-by: default avatarAviv Heller <avivh@mellanox.com>
Reviewed-by: default avatarMoni Shoua <monis@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0ea3c235

drivers/net/ethernet/mellanox/mlx5/core/lag.c

+3 −2
Original line number Diff line number Diff line
@@ -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,6 +303,7 @@ static int mlx5_handle_changeupper_event(struct mlx5_lag *ldev, 
	if (!netif_is_lag_master(upper))

		return 0;



	if (info->linking)

		lag_upper_info = info->upper_info;



	/* The event may still be of interest if the slave does not belong to