l2tp: device MTU setup, tunnel socket needs a lock
The MTU overhead calculation in L2TP device set-up
merged via commit b784e7ebfc
needs to be adjusted to lock the tunnel socket while
referencing the sub-data structures to derive the
socket's IP overhead.
Reported-by: Guillaume Nault <g.nault@alphalink.fr>
Tested-by: Guillaume Nault <g.nault@alphalink.fr>
Signed-off-by: R. Parameswaran <rparames@brocade.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
4a6e3c5def
commit
57240d0078
3 changed files with 4 additions and 2 deletions
|
@ -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_ioctl(struct socket *sock, int cmd, unsigned long arg);
|
||||||
int kernel_sock_shutdown(struct socket *sock, enum sock_shutdown_cmd how);
|
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);
|
u32 kernel_sock_ip_overhead(struct sock *sk);
|
||||||
|
|
||||||
#define MODULE_ALIAS_NETPROTO(proto) \
|
#define MODULE_ALIAS_NETPROTO(proto) \
|
||||||
|
|
|
@ -225,7 +225,9 @@ static void l2tp_eth_adjust_mtu(struct l2tp_tunnel *tunnel,
|
||||||
dev->needed_headroom += session->hdr_len;
|
dev->needed_headroom += session->hdr_len;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
lock_sock(tunnel->sock);
|
||||||
l3_overhead = kernel_sock_ip_overhead(tunnel->sock);
|
l3_overhead = kernel_sock_ip_overhead(tunnel->sock);
|
||||||
|
release_sock(tunnel->sock);
|
||||||
if (l3_overhead == 0) {
|
if (l3_overhead == 0) {
|
||||||
/* L3 Overhead couldn't be identified, this could be
|
/* L3 Overhead couldn't be identified, this could be
|
||||||
* because tunnel->sock was NULL or the socket's
|
* because tunnel->sock was NULL or the socket's
|
||||||
|
|
|
@ -3360,7 +3360,7 @@ EXPORT_SYMBOL(kernel_sock_shutdown);
|
||||||
/* This routine returns the IP overhead imposed by a socket i.e.
|
/* This routine returns the IP overhead imposed by a socket i.e.
|
||||||
* the length of the underlying IP header, depending on whether
|
* the length of the underlying IP header, depending on whether
|
||||||
* this is an IPv4 or IPv6 socket and the length from IP options turned
|
* 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)
|
u32 kernel_sock_ip_overhead(struct sock *sk)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue