netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Neal Cardwell <ncardwell@google.com>
To: David Miller <davem@davemloft.net>
Cc: netdev@vger.kernel.org, Eric Dumazet <edumazet@google.com>,
	Tom Herbert <therbert@google.com>,
	Neal Cardwell <ncardwell@google.com>
Subject: [PATCH 2/5] tcp: fix inet6_csk_route_req() for link-local addresses
Date: Sun, 24 Jun 2012 01:22:01 -0400	[thread overview]
Message-ID: <1340515324-2152-2-git-send-email-ncardwell@google.com> (raw)
In-Reply-To: <1340515324-2152-1-git-send-email-ncardwell@google.com>

Fix inet6_csk_route_req() to use as the flowi6_oif the treq->iif,
which is correctly fixed up in tcp_v6_conn_request() to handle the
case of link-local addresses. This brings it in line with the
tcp_v6_send_synack() code, which is already correctly using the
treq->iif in this way.

Signed-off-by: Neal Cardwell <ncardwell@google.com>
---
 net/ipv6/inet6_connection_sock.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/ipv6/inet6_connection_sock.c b/net/ipv6/inet6_connection_sock.c
index e6cee52..e23d354 100644
--- a/net/ipv6/inet6_connection_sock.c
+++ b/net/ipv6/inet6_connection_sock.c
@@ -68,7 +68,7 @@ struct dst_entry *inet6_csk_route_req(struct sock *sk,
 	fl6.daddr = treq->rmt_addr;
 	final_p = fl6_update_dst(&fl6, np->opt, &final);
 	fl6.saddr = treq->loc_addr;
-	fl6.flowi6_oif = sk->sk_bound_dev_if;
+	fl6.flowi6_oif = treq->iif;
 	fl6.flowi6_mark = sk->sk_mark;
 	fl6.fl6_dport = inet_rsk(req)->rmt_port;
 	fl6.fl6_sport = inet_rsk(req)->loc_port;
-- 
1.7.7.3

  reply	other threads:[~2012-06-24  5:22 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-06-24  5:22 [PATCH 1/5] tcp: heed result of security_inet_conn_request() in tcp_v6_conn_request() Neal Cardwell
2012-06-24  5:22 ` Neal Cardwell [this message]
2012-06-24  7:37   ` [PATCH 2/5] tcp: fix inet6_csk_route_req() for link-local addresses Eric Dumazet
2012-06-24  5:22 ` [PATCH 3/5] tcp: pass fl6 to inet6_csk_route_req() Neal Cardwell
2012-06-24  5:22 ` [PATCH 4/5] tcp: use inet6_csk_route_req() in tcp_v6_send_synack() Neal Cardwell
2012-06-24  5:22 ` [PATCH 5/5] tcp: plug dst leak in tcp_v6_conn_request() Neal Cardwell
2012-06-24  6:44   ` Eric Dumazet
2012-06-24  7:41   ` Eric Dumazet
2012-06-24 17:12     ` Neal Cardwell
2012-06-25  6:35       ` Eric Dumazet
2012-06-25 23:06       ` David Miller
2012-06-24  7:36 ` [PATCH 1/5] tcp: heed result of security_inet_conn_request() " Eric Dumazet
2012-06-25 23:05   ` 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=1340515324-2152-2-git-send-email-ncardwell@google.com \
    --to=ncardwell@google.com \
    --cc=davem@davemloft.net \
    --cc=edumazet@google.com \
    --cc=netdev@vger.kernel.org \
    --cc=therbert@google.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).