Commit 36f1031c authored Aug 27, 2019 by Thomas Falcon Committed by David S. Miller Aug 28, 2019

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>

parent 0754b4e8

drivers/net/ethernet/ibm/ibmvnic.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -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();

Admin message