@@ -5990,15 +5990,19 @@ static void e1000_reset_task(struct work_struct *work)
struct e1000_adapter *adapter;
adapter = container_of(work, struct e1000_adapter, reset_task);
+ rtnl_lock();
/* don't run the task if already down */
- if (test_bit(__E1000_DOWN, &adapter->state))
+ if (test_bit(__E1000_DOWN, &adapter->state)) {
+ rtnl_unlock();
return;
+ }
if (!(adapter->flags & FLAG_RESTART_NOW)) {
e1000e_dump(adapter);
e_err("Reset adapter unexpectedly\n");
}
e1000e_reinit_locked(adapter);
+ rtnl_unlock();
}
/**
A possible race condition was found in e1000_reset_task, after discovering a similar issue in igb driver (024a8168b7 igb: reinit_locked() should be called with rtnl_lock). Added rtnl_lock() and rtnl_unlock() to avoid this. Signed-off-by: Vitaly Lifshits <vitaly.lifshits@intel.com> Suggested-by: Jakub Kicinski <kuba@kernel.org> --- drivers/net/ethernet/intel/e1000e/netdev.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)