Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 91035f0b authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

tcp: fix inet_twsk_deschedule() 



Eric W. Biederman reported a lockdep splat in inet_twsk_deschedule()

This is caused by inet_twsk_purge(), run from process context,
and commit 575f4cd5 (net: Use rcu lookups in inet_twsk_purge.)
removed the BH disabling that was necessary.

Add the BH disabling but fine grained, right before calling
inet_twsk_deschedule(), instead of whole function.

With help from Linus Torvalds and Eric W. Biederman

Reported-by: default avatarEric W. Biederman <ebiederm@xmission.com>
Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
CC: Daniel Lezcano <daniel.lezcano@free.fr>
CC: Pavel Emelyanov <xemul@openvz.org>
CC: Arnaldo Carvalho de Melo <acme@redhat.com>
CC: stable <stable@kernel.org> (# 2.6.33+)
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ece639ca

net/ipv4/inet_timewait_sock.c

+2 −0
Original line number Diff line number Diff line
@@ -505,7 +505,9 @@ restart: 
			}



			rcu_read_unlock();

			local_bh_disable();

			inet_twsk_deschedule(tw, twdr);

			local_bh_enable();

			inet_twsk_put(tw);

			goto restart_rcu;

		}