Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57240d00 authored by R. Parameswaran's avatar R. Parameswaran Committed by David S. Miller
Browse files

l2tp: device MTU setup, tunnel socket needs a lock 



The MTU overhead calculation in L2TP device set-up
merged via commit b784e7eb
needs to be adjusted to lock the tunnel socket while
referencing the sub-data structures to derive the
socket's IP overhead.

Reported-by: default avatarGuillaume Nault <g.nault@alphalink.fr>
Tested-by: default avatarGuillaume Nault <g.nault@alphalink.fr>
Signed-off-by: default avatarR. Parameswaran <rparames@brocade.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4a6e3c5d

include/linux/net.h

+1 −1
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ int kernel_sendpage(struct socket *sock, struct page *page, int offset, 
int kernel_sock_ioctl(struct socket *sock, int cmd, unsigned long arg);

int kernel_sock_shutdown(struct socket *sock, enum sock_shutdown_cmd how);



/* Following routine returns the IP overhead imposed by a socket.  */

/* Routine returns the IP overhead imposed by a (caller-protected) socket. */

u32 kernel_sock_ip_overhead(struct sock *sk);



#define MODULE_ALIAS_NETPROTO(proto) \

net/l2tp/l2tp_eth.c

+2 −0
Original line number Diff line number Diff line
@@ -225,7 +225,9 @@ static void l2tp_eth_adjust_mtu(struct l2tp_tunnel *tunnel, 
		dev->needed_headroom += session->hdr_len;

		return;

	}

	lock_sock(tunnel->sock);

	l3_overhead = kernel_sock_ip_overhead(tunnel->sock);

	release_sock(tunnel->sock);

	if (l3_overhead == 0) {

		/* L3 Overhead couldn't be identified, this could be

		 * because tunnel->sock was NULL or the socket's

net/socket.c

+1 −1
Original line number Diff line number Diff line
@@ -3360,7 +3360,7 @@ EXPORT_SYMBOL(kernel_sock_shutdown); 
/* This routine returns the IP overhead imposed by a socket i.e.

 * the length of the underlying IP header, depending on whether

 * this is an IPv4 or IPv6 socket and the length from IP options turned

 * on at the socket.

 * on at the socket. Assumes that the caller has a lock on the socket.

 */

u32 kernel_sock_ip_overhead(struct sock *sk)

{