From: wangweidong <wangweidong1@huawei•com>
To: Eric Dumazet <eric.dumazet@gmail•com>
Cc: <davem@davemloft•net>, <gerrit@erg•abdn.ac.uk>,
<kuznet@ms2•inr.ac.ru>, <jmorris@namei•org>,
<yoshfuji@linux-ipv6•org>, <kaber@trash•net>,
<vyasevich@gmail•com>, <nhorman@tuxdriver•com>,
<dccp@vger•kernel.org>, <netdev@vger•kernel.org>,
<linux-sctp@vger•kernel.org>, <dingtianhong@huawei•com>
Subject: Re: [PATCH 2/2] ipv6: use sk_v6_copy_addrs when memcpy struct ipv6_pinfo
Date: Tue, 19 Nov 2013 12:38:39 +0800 [thread overview]
Message-ID: <528AEB4F.90605@huawei.com> (raw)
In-Reply-To: <1384833303.8604.81.camel@edumazet-glaptop2.roam.corp.google.com>
On 2013/11/19 11:55, Eric Dumazet wrote:
> On Tue, 2013-11-19 at 10:47 +0800, Wang Weidong wrote:
>> commit efe4208f ("ipv6: make lookups simpler and faster") remove
>> the daddr and rcv_saddr from struct ipv6_pinfo. When use memcpy
>> the ipv6_pinfo, we lose the sk_v6_daddr and sk_v6_rcv_saddr, so
>> use the sk_v6_copy_addrs when needed.
>>
>> Signed-off-by: Wang Weidong <wangweidong1@huawei•com>
>> ---
>> net/dccp/ipv6.c | 4 ++++
>> net/ipv6/tcp_ipv6.c | 4 ++++
>> net/sctp/ipv6.c | 4 ++++
>> 3 files changed, 12 insertions(+)
>>
>> diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c
>> index 4ac71ff..90182a8 100644
>> --- a/net/dccp/ipv6.c
>> +++ b/net/dccp/ipv6.c
>> @@ -465,6 +465,10 @@ static struct sock *dccp_v6_request_recv_sock(struct sock *sk,
>> newnp = inet6_sk(newsk);
>>
>> memcpy(newnp, np, sizeof(struct ipv6_pinfo));
>> + /* Don't forget copy the rcv_saddr and daddr when
>> + * copy ipv6_pinfo.
>> + */
>> + sk_v6_copy_addrs(newsk, sk);
>>
>> ipv6_addr_set_v4mapped(newinet->inet_daddr, &newsk->sk_v6_daddr);
>>
>> diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
>> index 0740f93..83d011e 100644
>> --- a/net/ipv6/tcp_ipv6.c
>> +++ b/net/ipv6/tcp_ipv6.c
>> @@ -1116,6 +1116,10 @@ static struct sock * tcp_v6_syn_recv_sock(struct sock *sk, struct sk_buff *skb,
>> newtp = tcp_sk(newsk);
>>
>> memcpy(newnp, np, sizeof(struct ipv6_pinfo));
>> + /* Don't forget copy the rcv_saddr and daddr when
>> + * copy ipv6_pinfo.
>> + */
>> + sk_v6_copy_addrs(newsk, sk);
>>
>> ipv6_addr_set_v4mapped(newinet->inet_daddr, &newsk->sk_v6_daddr);
>>
>
>
> No idea why this patch is needed for TCP.
> (btw you deal with v4mapped here, no mention of it in the changelog)
>
> The fields were moved into generic socket, and generic socket is copied.
>
> Are you seeing a real bug ?
>
> Please elaborate, thanks !
>
Hm, You are right. I am not careful to look over the generic socket whether it would be
copied. Sorry for that.
Thanks.
>
>
>
>
prev parent reply other threads:[~2013-11-19 4:40 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-19 2:47 [PATCH 0/2] ipv6: fix the missing copies when memcpy ipv6_pinfo Wang Weidong
2013-11-19 2:47 ` [PATCH 1/2] ipv6: add helper function for copy addrs from old sock Wang Weidong
2013-11-19 2:47 ` [PATCH 2/2] ipv6: use sk_v6_copy_addrs when memcpy struct ipv6_pinfo Wang Weidong
2013-11-19 3:14 ` Hannes Frederic Sowa
2013-11-19 3:32 ` wangweidong
2013-11-19 3:58 ` Eric Dumazet
2013-11-19 4:00 ` Eric Dumazet
2013-11-19 4:44 ` wangweidong
2013-11-19 11:35 ` Daniel Borkmann
2013-11-19 14:23 ` Eric Dumazet
2013-11-19 14:26 ` Daniel Borkmann
2013-11-19 15:25 ` Vlad Yasevich
2013-11-19 11:04 ` Daniel Borkmann
2013-11-19 11:09 ` wangweidong
2013-11-19 3:55 ` Eric Dumazet
2013-11-19 4:38 ` wangweidong [this message]
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=528AEB4F.90605@huawei.com \
--to=wangweidong1@huawei$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=dccp@vger$(echo .)kernel.org \
--cc=dingtianhong@huawei$(echo .)com \
--cc=eric.dumazet@gmail$(echo .)com \
--cc=gerrit@erg$(echo .)abdn.ac.uk \
--cc=jmorris@namei$(echo .)org \
--cc=kaber@trash$(echo .)net \
--cc=kuznet@ms2$(echo .)inr.ac.ru \
--cc=linux-sctp@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=nhorman@tuxdriver$(echo .)com \
--cc=vyasevich@gmail$(echo .)com \
--cc=yoshfuji@linux-ipv6$(echo .)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