path: root/net
diff options
authorEric Dumazet <>2011-02-18 22:35:56 +0000
committerDavid S. Miller <>2011-02-19 18:59:04 -0800
commit91035f0b7d89291af728b6f3e370c3be58fcbe1b (patch)
treee15aeadf32b4e4c2874c72be0100dbe0f222f84a /net
parentece639caa33c85c8805fa4a0a5955b8de9c95346 (diff)
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 575f4cd5a5b6394577 (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: Eric W. Biederman <> Signed-off-by: Eric Dumazet <> CC: Daniel Lezcano <> CC: Pavel Emelyanov <> CC: Arnaldo Carvalho de Melo <> CC: stable <> (# 2.6.33+) Signed-off-by: David S. Miller <>
Diffstat (limited to 'net')
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ipv4/inet_timewait_sock.c b/net/ipv4/inet_timewait_sock.c
index c5af909cf701..3c8dfa16614d 100644
--- a/net/ipv4/inet_timewait_sock.c
+++ b/net/ipv4/inet_timewait_sock.c
@@ -505,7 +505,9 @@ restart:
+ local_bh_disable();
inet_twsk_deschedule(tw, twdr);
+ local_bh_enable();
goto restart_rcu;