From: James Chapman <jchapman@katalix•com>
To: Benjamin LaHaise <bcrl@kvack•org>
Cc: "David S. Miller" <davem@davemloft•net>, netdev@vger•kernel.org
Subject: Re: [PATCH] Fix pppol2tp getsockname()
Date: Tue, 20 Mar 2012 12:21:05 +0000 [thread overview]
Message-ID: <4F687631.1080507@katalix.com> (raw)
In-Reply-To: <4F686EE5.4040400@katalix.com>
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.
next prev parent reply other threads:[~2012-03-20 12:21 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
-- 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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4F687631.1080507@katalix.com \
--to=jchapman@katalix$(echo .)com \
--cc=bcrl@kvack$(echo .)org \
--cc=davem@davemloft$(echo .)net \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox