mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 10:40:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

net/tcp: Fix socket lookups with SO_BINDTODEVICE

Browse source 
Similar to 69678bcd4d ("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: 3fa6f616a7 ("net: ipv4: add second dif to inet socket lookups")
Fixes: 4297a0ef08 ("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>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David Ahern 2018-06-18 12:30:37 -07:00 committed by David S. Miller
parent f696a21c22
commit 8c43bd1706
2 changed files with 4 additions and 4 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

4
net/ipv4/inet_hashtables.c
View file

@ -243,9 +243,9 @@ static inline int compute_score(struct sock *sk, struct net *net,
bool dev_match = (sk->sk_bound_dev_if == dif || bool dev_match = (sk->sk_bound_dev_if == dif ||
sk->sk_bound_dev_if == sdif); sk->sk_bound_dev_if == sdif);
if (exact_dif && !dev_match) if (!dev_match)
return -1; return -1;
if (sk->sk_bound_dev_if && dev_match) if (sk->sk_bound_dev_if)
score += 4; score += 4;
} }
if (sk->sk_incoming_cpu == raw_smp_processor_id()) if (sk->sk_incoming_cpu == raw_smp_processor_id())

4
net/ipv6/inet6_hashtables.c
View file

@ -113,9 +113,9 @@ static inline int compute_score(struct sock *sk, struct net *net,
bool dev_match = (sk->sk_bound_dev_if == dif || bool dev_match = (sk->sk_bound_dev_if == dif ||
sk->sk_bound_dev_if == sdif); sk->sk_bound_dev_if == sdif);
if (exact_dif && !dev_match) if (!dev_match)
return -1; return -1;
if (sk->sk_bound_dev_if && dev_match) if (sk->sk_bound_dev_if)
score++; score++;
} }
if (sk->sk_incoming_cpu == raw_smp_processor_id()) if (sk->sk_incoming_cpu == raw_smp_processor_id())