On Fri, 2013-11-22 at 12:20 +0400, Vladimir Davydov wrote: > On e1000_down(), we should ensure every asynchronous work is canceled > before proceeding. Since the watchdog_task can schedule other works > apart from itself, it should be stopped first, but currently it is > stopped after the reset_task. This can result in the following race > leading to the reset_task running after the module unload: > > e1000_down_and_stop(): e1000_watchdog(): > ---------------------- ----------------- > > cancel_work_sync(reset_task) > schedule_work(reset_task) > cancel_delayed_work_sync(watchdog_task) > > The patch moves cancel_delayed_work_sync(watchdog_task) at the > beginning > of e1000_down_and_stop() thus ensuring the race is impossible. > > Signed-off-by: Vladimir Davydov <vdavy...@parallels.com> > Cc: Tushar Dave <tushar.n.d...@intel.com> > Cc: Patrick McHardy <ka...@trash.net> > Cc: David S. Miller <da...@davemloft.net> > --- > drivers/net/ethernet/intel/e1000/e1000_main.c | 15 +++++++++++---- > 1 file changed, 11 insertions(+), 4 deletions(-)
I have applied your patch to my queue, thanks!
signature.asc
Description: This is a digitally signed message part
