68 lines
2.6 KiB
Diff
68 lines
2.6 KiB
Diff
|
From patchwork Mon Jun 18 19:30:37 2018
|
||
|
|
Content-Type: text/plain; charset="utf-8"
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Transfer-Encoding: 7bit
|
||
|
|
Subject: [net] net/tcp: Fix socket lookups with SO_BINDTODEVICE
|
||
|
|
X-Patchwork-Submitter: dsahern@kernel.org
|
||
|
|
X-Patchwork-Id: 931179
|
||
|
|
X-Patchwork-Delegate: davem@davemloft.net
|
||
|
|
Message-Id: <20180618193037.3365-1-dsahern@kernel.org>
|
||
|
|
To: netdev@vger.kernel.org
|
||
|
|
Cc: davem@davemloft.net, lberger@labn.net,
|
||
|
|
renato@opensourcerouting.org, David Ahern <dsahern@gmail.com>
|
||
|
|
Date: Mon, 18 Jun 2018 12:30:37 -0700
|
||
|
|
From: dsahern@kernel.org
|
||
|
|
List-Id: <netdev.vger.kernel.org>
|
||
|
|
|
||
|
|
From: David Ahern <dsahern@gmail.com>
|
||
|
|
|
||
|
|
Similar to 69678bcd4d2d ("udp: fix SO_BINDTODEVICE"), TCP socket lookups
|
||
|
|
need to fail if dev_match is not true. Currently, a packet to a given port
|
||
|
|
can match a socket bound to device when it should not. In the VRF case,
|
||
|
|
this causes the lookup to hit a VRF socket and not a global socket
|
||
|
|
resulting in a response trying to go through the VRF when it should it.
|
||
|
|
|
||
|
|
Fixes: 3fa6f616a7a4d ("net: ipv4: add second dif to inet socket lookups")
|
||
|
|
Fixes: 4297a0ef08572 ("net: ipv6: add second dif to inet6 socket lookups")
|
||
|
|
Reported-by: Lou Berger <lberger@labn.net>
|
||
|
|
Diagnosed-by: Renato Westphal <renato@opensourcerouting.org>
|
||
|
|
Tested-by: Renato Westphal <renato@opensourcerouting.org>
|
||
|
|
Signed-off-by: David Ahern <dsahern@gmail.com>
|
||
|
|
---
|
||
|
|
net/ipv4/inet_hashtables.c | 4 ++--
|
||
|
|
net/ipv6/inet6_hashtables.c | 4 ++--
|
||
|
|
2 files changed, 4 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
|
||
|
|
index 31ff46daae97..3647167c8fa3 100644
|
||
|
|
--- a/net/ipv4/inet_hashtables.c
|
||
|
|
+++ b/net/ipv4/inet_hashtables.c
|
||
|
|
@@ -243,9 +243,9 @@ static inline int compute_score(struct sock *sk, struct net *net,
|
||
|
|
bool dev_match = (sk->sk_bound_dev_if == dif ||
|
||
|
|
sk->sk_bound_dev_if == sdif);
|
||
|
|
|
||
|
|
- if (exact_dif && !dev_match)
|
||
|
|
+ if (!dev_match)
|
||
|
|
return -1;
|
||
|
|
- if (sk->sk_bound_dev_if && dev_match)
|
||
|
|
+ if (sk->sk_bound_dev_if)
|
||
|
|
score += 4;
|
||
|
|
}
|
||
|
|
if (sk->sk_incoming_cpu == raw_smp_processor_id())
|
||
|
|
diff --git a/net/ipv6/inet6_hashtables.c b/net/ipv6/inet6_hashtables.c
|
||
|
|
index 2febe26de6a1..595ad408dba0 100644
|
||
|
|
--- a/net/ipv6/inet6_hashtables.c
|
||
|
|
+++ b/net/ipv6/inet6_hashtables.c
|
||
|
|
@@ -113,9 +113,9 @@ static inline int compute_score(struct sock *sk, struct net *net,
|
||
|
|
bool dev_match = (sk->sk_bound_dev_if == dif ||
|
||
|
|
sk->sk_bound_dev_if == sdif);
|
||
|
|
|
||
|
|
- if (exact_dif && !dev_match)
|
||
|
|
+ if (!dev_match)
|
||
|
|
return -1;
|
||
|
|
- if (sk->sk_bound_dev_if && dev_match)
|
||
|
|
+ if (sk->sk_bound_dev_if)
|
||
|
|
score++;
|
||
|
|
}
|
||
|
|
if (sk->sk_incoming_cpu == raw_smp_processor_id())
|