This is a note to let you know that I've just added the patch titled
ice: Shut down VSI with "link-down-on-close" enabled
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
ice-shut-down-vsi-with-link-down-on-close-enabled.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
commit f1ef60049882de4af95c17ef50adb9017ecbaa09
Author: Ngai-Mint Kwan <ngai-mint.kwan@xxxxxxxxx>
Date: Fri Dec 15 12:01:57 2023 +0100
ice: Shut down VSI with "link-down-on-close" enabled
[ Upstream commit 6d05ff55ef4f4954d28551236239f297bd52ea48 ]
Disabling netdev with ethtool private flag "link-down-on-close" enabled
can cause NULL pointer dereference bug. Shut down VSI regardless of
"link-down-on-close" state.
Fixes: 8ac7132704f3 ("ice: Fix interface being down after reset with link-down-on-close flag on")
Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@xxxxxxxxx>
Signed-off-by: Ngai-Mint Kwan <ngai-mint.kwan@xxxxxxxxx>
Signed-off-by: Wojciech Drewek <wojciech.drewek@xxxxxxxxx>
Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@xxxxxxxxx> (A Contingent worker at Intel)
Signed-off-by: Tony Nguyen <anthony.l.nguyen@xxxxxxxxx>
Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
index 5eb3b80b293c0..ab46cfca4028d 100644
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@ -9071,6 +9071,8 @@ int ice_stop(struct net_device *netdev)
else
netdev_err(vsi->netdev, "Failed to set physical link down, VSI %d error %d\n",
vsi->vsi_num, link_err);
+
+ ice_vsi_close(vsi);
return -EIO;
}
}
