aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdi Nissim <adin@mellanox.com>2018-06-05 04:32:11 -0400
committerSaeed Mahameed <saeedm@mellanox.com>2018-07-31 15:58:44 -0400
commiteacecf2760e321bf1c99b981d44a14bd05721f15 (patch)
treeaac70cbaea8af662d931939de31ab6c0670da010
parent2e8e70d249e8c5c79bf88bbb36bb68154ab15471 (diff)
net/mlx5e: Fix null pointer access when setting MTU of vport representor
MTU helper function is used by both conventional mlx5e instances (PF/VF) and the eswitch representors. The representor shouldn't change the nic vport context MTU, the VF is responsible for that. Therefore set_mtu_cb has a null value when changing the representor MTU. Fixes: 250a42b6a764 ("net/mlx5e: Support configurable MTU for vport representors") Signed-off-by: Adi Nissim <adin@mellanox.com> Reviewed-by: Yevgeny Kliteynik <kliteyn@mellanox.com> Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
-rw-r--r--drivers/net/ethernet/mellanox/mlx5/core/en_main.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
index dae4156a710d..c592678ab5f1 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
@@ -3712,7 +3712,8 @@ int mlx5e_change_mtu(struct net_device *netdev, int new_mtu,
3712 3712
3713 if (!reset) { 3713 if (!reset) {
3714 params->sw_mtu = new_mtu; 3714 params->sw_mtu = new_mtu;
3715 set_mtu_cb(priv); 3715 if (set_mtu_cb)
3716 set_mtu_cb(priv);
3716 netdev->mtu = params->sw_mtu; 3717 netdev->mtu = params->sw_mtu;
3717 goto out; 3718 goto out;
3718 } 3719 }