]> git.karo-electronics.de Git - karo-tx-linux.git/commit
net: l2tp: unlock socket lock before returning from l2tp_ip_sendmsg
authorSasha Levin <levinsasha928@gmail.com>
Wed, 2 May 2012 03:58:43 +0000 (03:58 +0000)
committerBen Hutchings <ben@decadent.org.uk>
Sun, 20 May 2012 21:56:35 +0000 (22:56 +0100)
commit7b9c691febb4325f17a793fce9f86a1e90e37283
tree823f4d87acd428cee40f3bffb4e40f6ed0c06e28
parent4b3bd838fd1c301fe29c07ac1ac4ca555e1b8119
net: l2tp: unlock socket lock before returning from l2tp_ip_sendmsg

[ Upstream commit 84768edbb2721637620b2d84501bb0d5aed603f1 ]

l2tp_ip_sendmsg could return without releasing socket lock, making it all the
way to userspace, and generating the following warning:

[  130.891594] ================================================
[  130.894569] [ BUG: lock held when returning to user space! ]
[  130.897257] 3.4.0-rc5-next-20120501-sasha #104 Tainted: G        W
[  130.900336] ------------------------------------------------
[  130.902996] trinity/8384 is leaving the kernel with locks still held!
[  130.906106] 1 lock held by trinity/8384:
[  130.907924]  #0:  (sk_lock-AF_INET){+.+.+.}, at: [<ffffffff82b9503f>] l2tp_ip_sendmsg+0x2f/0x550

Introduced by commit 2f16270 ("l2tp: Fix locking in l2tp_ip.c").

Signed-off-by: Sasha Levin <levinsasha928@gmail.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
net/l2tp/l2tp_ip.c