percpu_counter: fix CPU unplug race in percpu_counter_destroy()
We should first delete the counter from percpu_counters list before freeing memory, or a percpu_counter_hotcpu_callback() could dereference a NULL pointer. Signed-off-by: Eric Dumazet <dada1@cosmosbay.com> Acked-by: David S. Miller <davem@davemloft.net> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Mingming Cao <cmm@us.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
committed by
Linus Torvalds
parent
fe102c71a6
commit
fd3d664fef
@@ -104,13 +104,13 @@ void percpu_counter_destroy(struct percpu_counter *fbc)
|
|||||||
if (!fbc->counters)
|
if (!fbc->counters)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
free_percpu(fbc->counters);
|
|
||||||
fbc->counters = NULL;
|
|
||||||
#ifdef CONFIG_HOTPLUG_CPU
|
#ifdef CONFIG_HOTPLUG_CPU
|
||||||
mutex_lock(&percpu_counters_lock);
|
mutex_lock(&percpu_counters_lock);
|
||||||
list_del(&fbc->list);
|
list_del(&fbc->list);
|
||||||
mutex_unlock(&percpu_counters_lock);
|
mutex_unlock(&percpu_counters_lock);
|
||||||
#endif
|
#endif
|
||||||
|
free_percpu(fbc->counters);
|
||||||
|
fbc->counters = NULL;
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(percpu_counter_destroy);
|
EXPORT_SYMBOL(percpu_counter_destroy);
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user