* [PATCH net-next v1 1/1] L2TP device MTU setup - tunnel socket needs a lock
@ 2017-04-12 3:14 R. Parameswaran
2017-04-12 7:53 ` Guillaume Nault
2017-04-12 14:13 ` David Miller
0 siblings, 2 replies; 5+ messages in thread
From: R. Parameswaran @ 2017-04-12 3:14 UTC (permalink / raw)
To: netdev
Cc: kleptog, jchapman, davem, nprachan, rshearma, stephen, sdietric,
ciwillia, lboccass, dfawcus, bhong, jblunck, linux-kernel
The MTU overhead calculation in L2TP device set-up
merged via commit b784e7ebfce8cfb16c6f95e14e8532d0768ab7ff
needs to be adjusted to lock the tunnel socket while
referencing the sub-data structures to derive the
socket's IP overhead.
---
include/linux/net.h | 2 +-
net/l2tp/l2tp_eth.c | 2 ++
net/socket.c | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/include/linux/net.h b/include/linux/net.h
index a42fab2..abcfa46 100644
--- a/include/linux/net.h
+++ b/include/linux/net.h
@@ -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) \
diff --git a/net/l2tp/l2tp_eth.c b/net/l2tp/l2tp_eth.c
index 138566a..b722d55 100644
--- a/net/l2tp/l2tp_eth.c
+++ b/net/l2tp/l2tp_eth.c
@@ -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
diff --git a/net/socket.c b/net/socket.c
index eea9970..c2564eb 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -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)
{
--
2.1.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH net-next v1 1/1] L2TP device MTU setup - tunnel socket needs a lock
2017-04-12 3:14 [PATCH net-next v1 1/1] L2TP device MTU setup - tunnel socket needs a lock R. Parameswaran
@ 2017-04-12 7:53 ` Guillaume Nault
2017-04-12 20:42 ` R Parameswaran
2017-04-12 14:13 ` David Miller
1 sibling, 1 reply; 5+ messages in thread
From: Guillaume Nault @ 2017-04-12 7:53 UTC (permalink / raw)
To: R. Parameswaran
Cc: netdev, kleptog, jchapman, davem, nprachan, rshearma, stephen,
sdietric, ciwillia, lboccass, dfawcus, bhong, jblunck,
linux-kernel
On Tue, Apr 11, 2017 at 08:14:37PM -0700, R. Parameswaran wrote:
>
> The MTU overhead calculation in L2TP device set-up
> merged via commit b784e7ebfce8cfb16c6f95e14e8532d0768ab7ff
> needs to be adjusted to lock the tunnel socket while
> referencing the sub-data structures to derive the
> socket's IP overhead.
Thanks.
Tested-by: Guillaume Nault <g.nault@alphalink.fr>
BTW, you don't need to add "v1" for the first version of a patch.
There's also no need for numbering pathes when there's only one in the
series. And we normally prefix the commit message with "<subsystem>: ".
For this patch, your subject would look like " [PATCH net-next] l2tp: ...".
Also, you could have added a "Reported-by:" tag (I don't really mind
in this case, but that's good practice).
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH net-next v1 1/1] L2TP device MTU setup - tunnel socket needs a lock
2017-04-12 7:53 ` Guillaume Nault
@ 2017-04-12 20:42 ` R Parameswaran
0 siblings, 0 replies; 5+ messages in thread
From: R Parameswaran @ 2017-04-12 20:42 UTC (permalink / raw)
To: Guillaume Nault
Cc: Linux Kernel Network Developers, kleptog, James Chapman,
David Miller, Nachi Prachanda, Robert Shearman,
Stephen Hemminger, Sven-Thorsten Dietrich, Chas Williams III,
Luca Boccassi, Derek Fawcus, Bill Hong, Jan Blunck, LKML
Hi Guillaume,
Please see inline:
On Wed, Apr 12, 2017 at 12:53 AM, Guillaume Nault <g.nault@alphalink.fr> wrote:
> On Tue, Apr 11, 2017 at 08:14:37PM -0700, R. Parameswaran wrote:
>>
>> The MTU overhead calculation in L2TP device set-up
>> merged via commit b784e7ebfce8cfb16c6f95e14e8532d0768ab7ff
>> needs to be adjusted to lock the tunnel socket while
>> referencing the sub-data structures to derive the
>> socket's IP overhead.
>
> Thanks.
>
> Tested-by: Guillaume Nault <g.nault@alphalink.fr>
>
> BTW, you don't need to add "v1" for the first version of a patch.
> There's also no need for numbering pathes when there's only one in the
> series. And we normally prefix the commit message with "<subsystem>: ".
> For this patch, your subject would look like " [PATCH net-next] l2tp: ...".
>
> Also, you could have added a "Reported-by:" tag (I don't really mind
> in this case, but that's good practice).
Thanks for correcting these (and for testing the changes) and sorry
for the Reported-by omission. I'll respin by tonight
with these, per reply to Dave.
regards,
Ramkumar
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH net-next v1 1/1] L2TP device MTU setup - tunnel socket needs a lock
2017-04-12 3:14 [PATCH net-next v1 1/1] L2TP device MTU setup - tunnel socket needs a lock R. Parameswaran
2017-04-12 7:53 ` Guillaume Nault
@ 2017-04-12 14:13 ` David Miller
2017-04-12 20:38 ` R Parameswaran
1 sibling, 1 reply; 5+ messages in thread
From: David Miller @ 2017-04-12 14:13 UTC (permalink / raw)
To: parameswaran.r7
Cc: netdev, kleptog, jchapman, nprachan, rshearma, stephen, sdietric,
ciwillia, lboccass, dfawcus, bhong, jblunck, linux-kernel
From: "R. Parameswaran" <parameswaran.r7@gmail.com>
Date: Tue, 11 Apr 2017 20:14:37 -0700 (PDT)
>
> The MTU overhead calculation in L2TP device set-up
> merged via commit b784e7ebfce8cfb16c6f95e14e8532d0768ab7ff
> needs to be adjusted to lock the tunnel socket while
> referencing the sub-data structures to derive the
> socket's IP overhead.
This is missing a proper signoff.
The subject line also needs to be fixed "[PATCH net-next] l2tp: " as explained
by Guillaume.
Thanks.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH net-next v1 1/1] L2TP device MTU setup - tunnel socket needs a lock
2017-04-12 14:13 ` David Miller
@ 2017-04-12 20:38 ` R Parameswaran
0 siblings, 0 replies; 5+ messages in thread
From: R Parameswaran @ 2017-04-12 20:38 UTC (permalink / raw)
To: David Miller
Cc: Linux Kernel Network Developers, kleptog, James Chapman,
Nachi Prachanda, Robert Shearman, Stephen Hemminger,
Sven-Thorsten Dietrich, Chas Williams III, Luca Boccassi,
Derek Fawcus, Bill Hong, Jan Blunck, LKML
Hi Dave,
Please see inline:
On Wed, Apr 12, 2017 at 7:13 AM, David Miller <davem@davemloft.net> wrote:
> From: "R. Parameswaran" <parameswaran.r7@gmail.com>
> Date: Tue, 11 Apr 2017 20:14:37 -0700 (PDT)
>
>>
>> The MTU overhead calculation in L2TP device set-up
>> merged via commit b784e7ebfce8cfb16c6f95e14e8532d0768ab7ff
>> needs to be adjusted to lock the tunnel socket while
>> referencing the sub-data structures to derive the
>> socket's IP overhead.
>
> This is missing a proper signoff.
>
> The subject line also needs to be fixed "[PATCH net-next] l2tp: " as explained
> by Guillaume.
>
Thanks, I will re-spin with these corrections by tonight PT.
regards,
Ramkumar
> Thanks.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-04-12 20:42 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-04-12 3:14 [PATCH net-next v1 1/1] L2TP device MTU setup - tunnel socket needs a lock R. Parameswaran
2017-04-12 7:53 ` Guillaume Nault
2017-04-12 20:42 ` R Parameswaran
2017-04-12 14:13 ` David Miller
2017-04-12 20:38 ` R Parameswaran
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.