* [PATCH] Fix pppol2tp getsockname()
@ 2012-03-19 3:15 Benjamin LaHaise
2012-03-19 21:50 ` David Miller
2012-03-20 11:49 ` James Chapman
0 siblings, 2 replies; 7+ messages in thread
From: Benjamin LaHaise @ 2012-03-19 3:15 UTC (permalink / raw)
To: David S. Miller; +Cc: James Chapman, netdev
While testing L2TP functionality, I came across a bug in getsockname(). The
IP address returned within the pppol2tp_addr's addr memember was not being
set to the IP address in use. This bug is caused by using inet_sk() on the
wrong socket (the L2TP socket rather than the underlying UDP socket), and was
likely introduced during the addition of L2TPv3 support.
---
net/l2tp/l2tp_ppp.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/net/l2tp/l2tp_ppp.c b/net/l2tp/l2tp_ppp.c
index 96bc7a6..9b07191 100644
--- a/net/l2tp/l2tp_ppp.c
+++ b/net/l2tp/l2tp_ppp.c
@@ -915,7 +915,7 @@ static int pppol2tp_getname(struct socket *sock, struct sockaddr *uaddr,
goto end_put_sess;
}
- inet = inet_sk(sk);
+ inet = inet_sk(tunnel->sock);
if (tunnel->version == 2) {
struct sockaddr_pppol2tp sp;
len = sizeof(sp);
--
1.7.4.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH] Fix pppol2tp getsockname()
2012-03-19 3:15 [PATCH] Fix pppol2tp getsockname() Benjamin LaHaise
@ 2012-03-19 21:50 ` David Miller
2012-03-20 11:49 ` James Chapman
1 sibling, 0 replies; 7+ messages in thread
From: David Miller @ 2012-03-19 21:50 UTC (permalink / raw)
To: bcrl; +Cc: jchapman, netdev
From: Benjamin LaHaise <bcrl@kvack.org>
Date: Sun, 18 Mar 2012 23:15:34 -0400
>
> While testing L2TP functionality, I came across a bug in getsockname(). The
> IP address returned within the pppol2tp_addr's addr memember was not being
> set to the IP address in use. This bug is caused by using inet_sk() on the
> wrong socket (the L2TP socket rather than the underlying UDP socket), and was
> likely introduced during the addition of L2TPv3 support.
Please resubmit this freshly with a proper signoff.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] Fix pppol2tp getsockname()
2012-03-19 3:15 [PATCH] Fix pppol2tp getsockname() Benjamin LaHaise
2012-03-19 21:50 ` David Miller
@ 2012-03-20 11:49 ` James Chapman
2012-03-20 12:21 ` James Chapman
1 sibling, 1 reply; 7+ messages in thread
From: James Chapman @ 2012-03-20 11:49 UTC (permalink / raw)
To: Benjamin LaHaise; +Cc: David S. Miller, netdev
On 19/03/12 03:15, Benjamin LaHaise wrote:
>
> While testing L2TP functionality, I came across a bug in getsockname(). The
> IP address returned within the pppol2tp_addr's addr memember was not being
> set to the IP address in use. This bug is caused by using inet_sk() on the
> wrong socket (the L2TP socket rather than the underlying UDP socket), and was
> likely introduced during the addition of L2TPv3 support.
> ---
> net/l2tp/l2tp_ppp.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/net/l2tp/l2tp_ppp.c b/net/l2tp/l2tp_ppp.c
> index 96bc7a6..9b07191 100644
> --- a/net/l2tp/l2tp_ppp.c
> +++ b/net/l2tp/l2tp_ppp.c
> @@ -915,7 +915,7 @@ static int pppol2tp_getname(struct socket *sock, struct sockaddr *uaddr,
> goto end_put_sess;
> }
>
> - inet = inet_sk(sk);
> + inet = inet_sk(tunnel->sock);
> if (tunnel->version == 2) {
> struct sockaddr_pppol2tp sp;
> len = sizeof(sp);
The patch is incorrect.
This is supposed to return the socket info of the pppol2tp socket, not
the tunnel socket. It is used by pppd's pppol2tp plugin to check that
the fd supplied is the right socket type.
--
James Chapman
Katalix Systems Ltd
http://www.katalix.com
Catalysts for your Embedded Linux software development
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] Fix pppol2tp getsockname()
2012-03-20 11:49 ` James Chapman
@ 2012-03-20 12:21 ` James Chapman
0 siblings, 0 replies; 7+ messages in thread
From: James Chapman @ 2012-03-20 12:21 UTC (permalink / raw)
To: Benjamin LaHaise; +Cc: David S. Miller, netdev
On 20/03/12 11:49, James Chapman wrote:
> On 19/03/12 03:15, Benjamin LaHaise wrote:
>>
>> While testing L2TP functionality, I came across a bug in getsockname(). The
>> IP address returned within the pppol2tp_addr's addr memember was not being
>> set to the IP address in use. This bug is caused by using inet_sk() on the
>> wrong socket (the L2TP socket rather than the underlying UDP socket), and was
>> likely introduced during the addition of L2TPv3 support.
>> ---
>> net/l2tp/l2tp_ppp.c | 2 +-
>> 1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/net/l2tp/l2tp_ppp.c b/net/l2tp/l2tp_ppp.c
>> index 96bc7a6..9b07191 100644
>> --- a/net/l2tp/l2tp_ppp.c
>> +++ b/net/l2tp/l2tp_ppp.c
>> @@ -915,7 +915,7 @@ static int pppol2tp_getname(struct socket *sock, struct sockaddr *uaddr,
>> goto end_put_sess;
>> }
>>
>> - inet = inet_sk(sk);
>> + inet = inet_sk(tunnel->sock);
>> if (tunnel->version == 2) {
>> struct sockaddr_pppol2tp sp;
>> len = sizeof(sp);
>
> The patch is incorrect.
>
> This is supposed to return the socket info of the pppol2tp socket, not
> the tunnel socket. It is used by pppd's pppol2tp plugin to check that
> the fd supplied is the right socket type.
Sorry, my mistake. This patch is fine.
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH] Fix pppol2tp getsockname()
@ 2012-03-20 13:57 Benjamin LaHaise
2012-03-20 14:49 ` James Chapman
0 siblings, 1 reply; 7+ messages in thread
From: Benjamin LaHaise @ 2012-03-20 13:57 UTC (permalink / raw)
To: David S. Miller, James Chapman; +Cc: netdev
While testing L2TP functionality, I came across a bug in getsockname(). The
IP address returned within the pppol2tp_addr's addr memember was not being
set to the IP address in use. This bug is caused by using inet_sk() on the
wrong socket (the L2TP socket rather than the underlying UDP socket), and was
likely introduced during the addition of L2TPv3 support.
Signed-off-by: Benjamin LaHaise <bcrl@kvack.org>
---
net/l2tp/l2tp_ppp.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/net/l2tp/l2tp_ppp.c b/net/l2tp/l2tp_ppp.c
index 96bc7a6..9b07191 100644
--- a/net/l2tp/l2tp_ppp.c
+++ b/net/l2tp/l2tp_ppp.c
@@ -915,7 +915,7 @@ static int pppol2tp_getname(struct socket *sock, struct sockaddr *uaddr,
goto end_put_sess;
}
- inet = inet_sk(sk);
+ inet = inet_sk(tunnel->sock);
if (tunnel->version == 2) {
struct sockaddr_pppol2tp sp;
len = sizeof(sp);
--
1.7.4.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH] Fix pppol2tp getsockname()
2012-03-20 13:57 Benjamin LaHaise
@ 2012-03-20 14:49 ` James Chapman
2012-03-20 20:13 ` David Miller
0 siblings, 1 reply; 7+ messages in thread
From: James Chapman @ 2012-03-20 14:49 UTC (permalink / raw)
To: Benjamin LaHaise, David S. Miller; +Cc: netdev
On 20/03/12 13:57, Benjamin LaHaise wrote:
> While testing L2TP functionality, I came across a bug in getsockname(). The
> IP address returned within the pppol2tp_addr's addr memember was not being
> set to the IP address in use. This bug is caused by using inet_sk() on the
> wrong socket (the L2TP socket rather than the underlying UDP socket), and was
> likely introduced during the addition of L2TPv3 support.
>
> Signed-off-by: Benjamin LaHaise <bcrl@kvack.org>
Signed-off-by: James Chapman <jchapman@katalix.com>
> ---
> net/l2tp/l2tp_ppp.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/net/l2tp/l2tp_ppp.c b/net/l2tp/l2tp_ppp.c
> index 96bc7a6..9b07191 100644
> --- a/net/l2tp/l2tp_ppp.c
> +++ b/net/l2tp/l2tp_ppp.c
> @@ -915,7 +915,7 @@ static int pppol2tp_getname(struct socket *sock, struct sockaddr *uaddr,
> goto end_put_sess;
> }
>
> - inet = inet_sk(sk);
> + inet = inet_sk(tunnel->sock);
> if (tunnel->version == 2) {
> struct sockaddr_pppol2tp sp;
> len = sizeof(sp);
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] Fix pppol2tp getsockname()
2012-03-20 14:49 ` James Chapman
@ 2012-03-20 20:13 ` David Miller
0 siblings, 0 replies; 7+ messages in thread
From: David Miller @ 2012-03-20 20:13 UTC (permalink / raw)
To: jchapman; +Cc: bcrl, netdev
From: James Chapman <jchapman@katalix.com>
Date: Tue, 20 Mar 2012 14:49:02 +0000
> On 20/03/12 13:57, Benjamin LaHaise wrote:
>> While testing L2TP functionality, I came across a bug in getsockname(). The
>> IP address returned within the pppol2tp_addr's addr memember was not being
>> set to the IP address in use. This bug is caused by using inet_sk() on the
>> wrong socket (the L2TP socket rather than the underlying UDP socket), and was
>> likely introduced during the addition of L2TPv3 support.
>>
>> Signed-off-by: Benjamin LaHaise <bcrl@kvack.org>
>
> Signed-off-by: James Chapman <jchapman@katalix.com>
Applied and queued up for -stable, thanks.
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2012-03-20 20:13 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-19 3:15 [PATCH] Fix pppol2tp getsockname() Benjamin LaHaise
2012-03-19 21:50 ` David Miller
2012-03-20 11:49 ` James Chapman
2012-03-20 12:21 ` James Chapman
-- strict thread matches above, loose matches on Subject: below --
2012-03-20 13:57 Benjamin LaHaise
2012-03-20 14:49 ` James Chapman
2012-03-20 20:13 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).