Commit 8c43bd17 authored by David Ahern's avatar David Ahern Committed by David S. Miller

net/tcp: Fix socket lookups with SO_BINDTODEVICE

Similar to 69678bcd ("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 not.

Fixes: 3fa6f616 ("net: ipv4: add second dif to inet socket lookups")
Fixes: 4297a0ef ("net: ipv6: add second dif to inet6 socket lookups")
Reported-by: default avatarLou Berger <lberger@labn.net>
Diagnosed-by: default avatarRenato Westphal <renato@opensourcerouting.org>
Tested-by: default avatarRenato Westphal <renato@opensourcerouting.org>
Signed-off-by: default avatarDavid Ahern <dsahern@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f696a21c
......@@ -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())
......
......@@ -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())
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment