Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 91035f0b7d89291af728b6f3e370c3be58fcbe1b

Authored by Eric Dumazet
Committed by David S. Miller
1 parent ece639caa3
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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 <ebiederm@xmission.com>
Signed-off-by: Eric 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: David S. Miller <davem@davemloft.net>

Showing 1 changed file with 2 additions and 0 deletions Side-by-side Diff

net/ipv4/inet_timewait_sock.c
Diff comments   View file @ 91035f0
... ... @@ -505,7 +505,9 @@
505 505 }
506 506  
507 507 rcu_read_unlock();
  508 + local_bh_disable();
508 509 inet_twsk_deschedule(tw, twdr);
  510 + local_bh_enable();
509 511 inet_twsk_put(tw);
510 512 goto restart_rcu;
511 513 }