Commit 8b82547e authored Mar 01, 2013 by Guillaume Nault Committed by David S. Miller Mar 01, 2013

l2tp: Restore socket refcount when sendmsg succeeds



The sendmsg() syscall handler for PPPoL2TP doesn't decrease the socket
reference counter after successful transmissions. Any successful
sendmsg() call from userspace will then increase the reference counter
forever, thus preventing the kernel's session and tunnel data from
being freed later on.

The problem only happens when writing directly on L2TP sockets.
PPP sockets attached to L2TP are unaffected as the PPP subsystem
uses pppol2tp_xmit() which symmetrically increase/decrease reference
counters.

This patch adds the missing call to sock_put() before returning from
pppol2tp_sendmsg().

Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 32fcafbc

net/l2tp/l2tp_ppp.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -355,6 +355,7 @@ static int pppol2tp_sendmsg(struct kiocb iocb, struct socket sock, struct msgh
		l2tp_xmit_skb(session, skb, session->hdr_len);

		sock_put(ps->tunnel_sock);
		sock_put(sk);

		return error;

Admin message