Commit 69678bcd authored May 09, 2018 by Paolo Abeni Committed by David S. Miller May 10, 2018

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: Damir 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: Paolo Abeni <pabeni@redhat.com>
Acked-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 0e8411e4

net/ipv4/udp.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;
		}

net/ipv6/udp.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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++;
		}

Admin message