* [RFC(v2) net-next 08/13] ipv6: Do not deoend on rt->n in ip6_dst_lookup_tail().
@ 2013-01-15 16:46 YOSHIFUJI Hideaki
2013-01-16 6:49 ` Cong Wang
0 siblings, 1 reply; 3+ messages in thread
From: YOSHIFUJI Hideaki @ 2013-01-15 16:46 UTC (permalink / raw)
To: netdev; +Cc: yoshfuji, xiyou.wangcong
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
---
net/ipv6/ip6_output.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index 9fc5d1d..b2fe048 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -921,8 +921,12 @@ static int ip6_dst_lookup_tail(struct sock *sk,
* dst entry of the nexthop router
*/
rt = (struct rt6_info *) *dst;
- n = rt->n;
- if (n && !(n->nud_state & NUD_VALID)) {
+ rcu_read_lock_bh();
+ n = __ipv6_neigh_lookup_noref(rt->dst.dev, rt6_nexthop(rt, &fl6->daddr));
+ err = n && !(n->nud_state & NUD_VALID) ? -EINVAL : 0;
+ rcu_read_unlock_bh();
+
+ if (err) {
struct inet6_ifaddr *ifp;
struct flowi6 fl_gw6;
int redirect;
--
1.7.9.5
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [RFC(v2) net-next 08/13] ipv6: Do not deoend on rt->n in ip6_dst_lookup_tail().
2013-01-15 16:46 [RFC(v2) net-next 08/13] ipv6: Do not deoend on rt->n in ip6_dst_lookup_tail() YOSHIFUJI Hideaki
@ 2013-01-16 6:49 ` Cong Wang
2013-01-16 12:27 ` YOSHIFUJI Hideaki
0 siblings, 1 reply; 3+ messages in thread
From: Cong Wang @ 2013-01-16 6:49 UTC (permalink / raw)
To: YOSHIFUJI Hideaki; +Cc: netdev
s/deoend/depend/ in $subject...
On 01/16/2013 12:46 AM, YOSHIFUJI Hideaki wrote:
> Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
> ---
> net/ipv6/ip6_output.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
> index 9fc5d1d..b2fe048 100644
> --- a/net/ipv6/ip6_output.c
> +++ b/net/ipv6/ip6_output.c
> @@ -921,8 +921,12 @@ static int ip6_dst_lookup_tail(struct sock *sk,
> * dst entry of the nexthop router
> */
> rt = (struct rt6_info *) *dst;
> - n = rt->n;
> - if (n && !(n->nud_state & NUD_VALID)) {
> + rcu_read_lock_bh();
> + n = __ipv6_neigh_lookup_noref(rt->dst.dev, rt6_nexthop(rt, &fl6->daddr));
> + err = n && !(n->nud_state & NUD_VALID) ? -EINVAL : 0;
> + rcu_read_unlock_bh();
> +
> + if (err) {
Are you sure the logic here equals?
In the original code, we could return 0 even we enter this if branch,
but after your patch, it seems it will return -EINVAL?
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [RFC(v2) net-next 08/13] ipv6: Do not deoend on rt->n in ip6_dst_lookup_tail().
2013-01-16 6:49 ` Cong Wang
@ 2013-01-16 12:27 ` YOSHIFUJI Hideaki
0 siblings, 0 replies; 3+ messages in thread
From: YOSHIFUJI Hideaki @ 2013-01-16 12:27 UTC (permalink / raw)
To: Cong Wang; +Cc: netdev
Cong Wang wrote:
> s/deoend/depend/ in $subject...
>
> On 01/16/2013 12:46 AM, YOSHIFUJI Hideaki wrote:
>> Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
>> ---
>> net/ipv6/ip6_output.c | 8 ++++++--
>> 1 file changed, 6 insertions(+), 2 deletions(-)
>>
>> diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
>> index 9fc5d1d..b2fe048 100644
>> --- a/net/ipv6/ip6_output.c
>> +++ b/net/ipv6/ip6_output.c
>> @@ -921,8 +921,12 @@ static int ip6_dst_lookup_tail(struct sock *sk,
>> * dst entry of the nexthop router
>> */
>> rt = (struct rt6_info *) *dst;
>> - n = rt->n;
>> - if (n && !(n->nud_state & NUD_VALID)) {
>> + rcu_read_lock_bh();
>> + n = __ipv6_neigh_lookup_noref(rt->dst.dev, rt6_nexthop(rt, &fl6->daddr));
>> + err = n && !(n->nud_state & NUD_VALID) ? -EINVAL : 0;
>> + rcu_read_unlock_bh();
>> +
>> + if (err) {
>
> Are you sure the logic here equals?
>
> In the original code, we could return 0 even we enter this if branch,
> but after your patch, it seems it will return -EINVAL?
>
err is always updated after the branch, or return 0;
--yoshfuji
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-01-16 12:27 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-15 16:46 [RFC(v2) net-next 08/13] ipv6: Do not deoend on rt->n in ip6_dst_lookup_tail() YOSHIFUJI Hideaki
2013-01-16 6:49 ` Cong Wang
2013-01-16 12:27 ` YOSHIFUJI Hideaki
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).