From: Ngai-Mint Kwan <[email protected]>
Getting coalesce settings while reset is in progress can cause NULL
pointer deference bug.
If under reset, abort get coalesce for ethtool.
Fixes: 67fe64d78c43 ("ice: Implement getting and setting ethtool coalesce")
Signed-off-by: Ngai-Mint Kwan <[email protected]>
Reviewed-by: Mateusz Polchlopek <[email protected]>
Signed-off-by: Pawel Chmielewski <[email protected]>
Reviewed-by: Simon Horman <[email protected]>
Signed-off-by: Dawid Osuchowski <[email protected]>
---
Changes since v1:
* Added "Fixes:" tag
Changes since v2:
* Rebased over current IWL net branch
* Confirmed that the issue previously reported for this patch [1] by
Himasekhar Reddy Pucha was caused by other, internally tracked issue -
reposting this as an ask for retest as well
[1]
https://lore.kernel.org/netdev/bl0pr11mb3122d70abde6c2acee376073bd...@bl0pr11mb3122.namprd11.prod.outlook.com/
---
drivers/net/ethernet/intel/ice/ice_ethtool.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/net/ethernet/intel/ice/ice_ethtool.c
b/drivers/net/ethernet/intel/ice/ice_ethtool.c
index 78b833b3e1d7..efdfe46a91ee 100644
--- a/drivers/net/ethernet/intel/ice/ice_ethtool.c
+++ b/drivers/net/ethernet/intel/ice/ice_ethtool.c
@@ -3825,6 +3825,9 @@ __ice_get_coalesce(struct net_device *netdev, struct
ethtool_coalesce *ec,
struct ice_netdev_priv *np = netdev_priv(netdev);
struct ice_vsi *vsi = np->vsi;
+ if (ice_is_reset_in_progress(vsi->back->state))
+ return -EBUSY;
+
if (q_num < 0)
q_num = 0;
--
2.44.0
