diff options
| author | Duncan Eastoe <deastoe@vyatta.att-mail.com> | 2018-11-07 15:36:06 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-11-07 16:12:39 -0800 |
| commit | 7055420fb6a1cb754a64be99ddcabd45bd902d99 (patch) | |
| tree | 469b838c4b00ccfc04f3583805eb5ebbf52ab14f /net/ipv4 | |
| parent | 6897445fb194c8ad046df4a13e1ee9f080a5a21e (diff) | |
| download | linux-stable-7055420fb6a1cb754a64be99ddcabd45bd902d99.tar.gz linux-stable-7055420fb6a1cb754a64be99ddcabd45bd902d99.tar.bz2 linux-stable-7055420fb6a1cb754a64be99ddcabd45bd902d99.zip | |
net: fix raw socket lookup device bind matching with VRFs
When there exist a pair of raw sockets one unbound and one bound
to a VRF but equal in all other respects, when a packet is received
in the VRF context, __raw_v4_lookup() matches on both sockets.
This results in the packet being delivered over both sockets,
instead of only the raw socket bound to the VRF. The bound device
checks in __raw_v4_lookup() are replaced with a call to
raw_sk_bound_dev_eq() which correctly handles whether the packet
should be delivered over the unbound socket in such cases.
In __raw_v6_lookup() the match on the device binding of the socket is
similarly updated to use raw_sk_bound_dev_eq() which matches the
handling in __raw_v4_lookup().
Importantly raw_sk_bound_dev_eq() takes the raw_l3mdev_accept sysctl
into account.
Signed-off-by: Duncan Eastoe <deastoe@vyatta.att-mail.com>
Signed-off-by: Mike Manning <mmanning@vyatta.att-mail.com>
Reviewed-by: David Ahern <dsahern@gmail.com>
Tested-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/raw.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c index 1ebd29abe79c..fb1f02015a15 100644 --- a/net/ipv4/raw.c +++ b/net/ipv4/raw.c @@ -131,8 +131,7 @@ struct sock *__raw_v4_lookup(struct net *net, struct sock *sk, if (net_eq(sock_net(sk), net) && inet->inet_num == num && !(inet->inet_daddr && inet->inet_daddr != raddr) && !(inet->inet_rcv_saddr && inet->inet_rcv_saddr != laddr) && - !(sk->sk_bound_dev_if && sk->sk_bound_dev_if != dif && - sk->sk_bound_dev_if != sdif)) + raw_sk_bound_dev_eq(net, sk->sk_bound_dev_if, dif, sdif)) goto found; /* gotcha */ } sk = NULL; |