Skip to content

Commit 84768ed

Browse files
sashalevindavem330
authored andcommitted
net: l2tp: unlock socket lock before returning from l2tp_ip_sendmsg
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 <[email protected]> Acked-by: Eric Dumazet <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 4fdcfa1 commit 84768ed

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

net/l2tp/l2tp_ip.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -442,8 +442,9 @@ static int l2tp_ip_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *m
442442

443443
daddr = lip->l2tp_addr.s_addr;
444444
} else {
445+
rc = -EDESTADDRREQ;
445446
if (sk->sk_state != TCP_ESTABLISHED)
446-
return -EDESTADDRREQ;
447+
goto out;
447448

448449
daddr = inet->inet_daddr;
449450
connected = 1;

0 commit comments

Comments
 (0)