diff options
author | Thomas Falcon <tlfalcon@linux.ibm.com> | 2019-08-27 11:10:04 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2019-08-28 15:45:40 -0700 |
commit | 36f1031c51a2538e5558fb44c6d6b88f98d3c0f2 (patch) | |
tree | 659a4ea9c5f3ab608afc8bfb22a06d249d501957 /drivers/net | |
parent | 0754b4e8cdf3eec6e4122e79af26ed9bab20f8f8 (diff) | |
download | linux-stable-36f1031c51a2538e5558fb44c6d6b88f98d3c0f2.tar.gz linux-stable-36f1031c51a2538e5558fb44c6d6b88f98d3c0f2.tar.bz2 linux-stable-36f1031c51a2538e5558fb44c6d6b88f98d3c0f2.zip |
ibmvnic: Do not process reset during or after device removal
Currently, the ibmvnic driver will not schedule device resets
if the device is being removed, but does not check the device
state before the reset is actually processed. This leads to a race
where a reset is scheduled with a valid device state but is
processed after the driver has been removed, resulting in an oops.
Fix this by checking the device state before processing a queued
reset event.
Reported-by: Abdul Haleem <abdhalee@linux.vnet.ibm.com>
Tested-by: Abdul Haleem <abdhalee@linux.vnet.ibm.com>
Signed-off-by: Thomas Falcon <tlfalcon@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/ethernet/ibm/ibmvnic.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c index cebd20f3128d..fa4bb940665c 100644 --- a/drivers/net/ethernet/ibm/ibmvnic.c +++ b/drivers/net/ethernet/ibm/ibmvnic.c @@ -1983,6 +1983,10 @@ static void __ibmvnic_reset(struct work_struct *work) rwi = get_next_rwi(adapter); while (rwi) { + if (adapter->state == VNIC_REMOVING || + adapter->state == VNIC_REMOVED) + goto out; + if (adapter->force_reset_recovery) { adapter->force_reset_recovery = false; rc = do_hard_reset(adapter, rwi, reset_state); @@ -2007,7 +2011,7 @@ static void __ibmvnic_reset(struct work_struct *work) netdev_dbg(adapter->netdev, "Reset failed\n"); free_all_rwi(adapter); } - +out: adapter->resetting = false; if (we_lock_rtnl) rtnl_unlock(); |