Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

lt2p: Fix possible WARN_ON from socket code when UDP socket is closed

If an L2TP daemon closes a tunnel socket while packets are queued in
the tunnel's reorder queue, a kernel warning is logged because the
socket is closed while skbs are still referencing it. The fix is to
purge the queue in the socket's release handler.

WARNING: at include/net/sock.h:351 udp_lib_unhash+0x41/0x68()
Pid: 12998, comm: openl2tpd Not tainted 2.6.25 #8
[<c0423c58>] warn_on_slowpath+0x41/0x51
[<c05d33a7>] udp_lib_unhash+0x41/0x68
[<c059424d>] sk_common_release+0x23/0x90
[<c05d16be>] udp_lib_close+0x8/0xa
[<c05d8684>] inet_release+0x42/0x48
[<c0592599>] sock_release+0x14/0x60
[<c059299f>] sock_close+0x29/0x30
[<c046ef52>] __fput+0xad/0x15b
[<c046f1d9>] fput+0x17/0x19
[<c046c8c4>] filp_close+0x50/0x5a
[<c046da06>] sys_close+0x69/0x9f
[<c04048ce>] syscall_call+0x7/0xb

Signed-off-by: James Chapman <jchapman@katalix.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

James Chapman and committed by
David S. Miller
199f7d24 b4496d44

+10
+10
drivers/net/pppol2tp.c
··· 1279 1279 static int pppol2tp_release(struct socket *sock) 1280 1280 { 1281 1281 struct sock *sk = sock->sk; 1282 + struct pppol2tp_session *session; 1282 1283 int error; 1283 1284 1284 1285 if (!sk) ··· 1297 1296 sock_orphan(sk); 1298 1297 sock->sk = NULL; 1299 1298 1299 + session = pppol2tp_sock_to_session(sk); 1300 + 1300 1301 /* Purge any queued data */ 1301 1302 skb_queue_purge(&sk->sk_receive_queue); 1302 1303 skb_queue_purge(&sk->sk_write_queue); 1304 + if (session != NULL) { 1305 + struct sk_buff *skb; 1306 + while ((skb = skb_dequeue(&session->reorder_q))) { 1307 + kfree_skb(skb); 1308 + sock_put(sk); 1309 + } 1310 + } 1303 1311 1304 1312 release_sock(sk); 1305 1313