Commit d70127e8 authored Oct 28, 2014 by Nikolay Aleksandrov Committed by David S. Miller Oct 29, 2014

inet: frags: remove the WARN_ON from inet_evict_bucket



The WARN_ON in inet_evict_bucket can be triggered by a valid case:
inet_frag_kill and inet_evict_bucket can be running in parallel on the
same queue which means that there has been at least one more ref added
by a previous inet_frag_find call, but inet_frag_kill can delete the
timer before inet_evict_bucket which will cause the WARN_ON() there to
trigger since we'll have refcnt!=1. Now, this case is valid because the
queue is being "killed" for some reason (removed from the chain list and
its timer deleted) so it will get destroyed in the end by one of the
inet_frag_put() calls which reaches 0 i.e. refcnt is still valid.

CC: Florian Westphal <fw@strlen.de>
CC: Eric Dumazet <eric.dumazet@gmail.com>
CC: Patrick McLean <chutzpah@gentoo.org>

Fixes: b13d3cbf ("inet: frag: move eviction of queues to work queue")
Reported-by: Patrick McLean <chutzpah@gentoo.org>
Signed-off-by: Nikolay Aleksandrov <nikolay@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 65ba1f1e

net/ipv4/inet_fragment.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -146,7 +146,6 @@ evict_again:
		atomic_inc(&fq->refcnt);
		spin_unlock(&hb->chain_lock);
		del_timer_sync(&fq->timer);
		WARN_ON(atomic_read(&fq->refcnt) != 1);
		inet_frag_put(fq, f);
		goto evict_again;
		}

Admin message