Commit 69678bcd authored by Paolo Abeni's avatar Paolo Abeni Committed by David S. Miller
Browse files

udp: fix SO_BINDTODEVICE

Damir reported a breakage of SO_BINDTODEVICE for UDP sockets.
In absence of VRF devices, after commit fb74c277

 ("net:
ipv4: add second dif to udp socket lookups") the dif mismatch
isn't fatal anymore for UDP socket lookup with non null
sk_bound_dev_if, breaking SO_BINDTODEVICE semantics.

This changeset addresses the issue making the dif match mandatory
again in the above scenario.

Reported-by: default avatarDamir Mansurov <dnman@oktetlabs.ru>
Fixes: fb74c277 ("net: ipv4: add second dif to udp socket lookups")
Fixes: 1801b570

 ("net: ipv6: add second dif to udp socket lookups")
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Acked-by: default avatarDavid Ahern <dsahern@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0e8411e4
......@@ -401,9 +401,9 @@ static 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;
}
......
......@@ -148,9 +148,9 @@ static 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++;
}
......
Supports Markdown
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