diff mbox series

[net] ipv6: Consider sk_bound_dev_if when binding a raw socket to an address

Message ID 20190520185717.24914-1-mmanning@vyatta.att-mail.com
State Accepted
Delegated to: David Miller
Headers show
Series [net] ipv6: Consider sk_bound_dev_if when binding a raw socket to an address | expand

Commit Message

Mike Manning May 20, 2019, 6:57 p.m. UTC
IPv6 does not consider if the socket is bound to a device when binding
to an address. The result is that a socket can be bound to eth0 and
then bound to the address of eth1. If the device is a VRF, the result
is that a socket can only be bound to an address in the default VRF.

Resolve by considering the device if sk_bound_dev_if is set.

Signed-off-by: Mike Manning <mmanning@vyatta.att-mail.com>
---
 net/ipv6/raw.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

David Ahern May 20, 2019, 10:16 p.m. UTC | #1
On 5/20/19 12:57 PM, Mike Manning wrote:
> IPv6 does not consider if the socket is bound to a device when binding
> to an address. The result is that a socket can be bound to eth0 and
> then bound to the address of eth1. If the device is a VRF, the result
> is that a socket can only be bound to an address in the default VRF.
> 
> Resolve by considering the device if sk_bound_dev_if is set.
> 
> Signed-off-by: Mike Manning <mmanning@vyatta.att-mail.com>
> ---
>  net/ipv6/raw.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
> index 84dbe21b71e5..96a3559f2a09 100644
> --- a/net/ipv6/raw.c
> +++ b/net/ipv6/raw.c
> @@ -287,7 +287,9 @@ static int rawv6_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len)
>  			/* Binding to link-local address requires an interface */
>  			if (!sk->sk_bound_dev_if)
>  				goto out_unlock;
> +		}
>  
> +		if (sk->sk_bound_dev_if) {
>  			err = -ENODEV;
>  			dev = dev_get_by_index_rcu(sock_net(sk),
>  						   sk->sk_bound_dev_if);
> 

Reviewed-by: David Ahern <dsahern@gmail.com>
Tested-by: David Ahern <dsahern@gmail.com>
David Miller May 21, 2019, 8:13 p.m. UTC | #2
From: Mike Manning <mmanning@vyatta.att-mail.com>
Date: Mon, 20 May 2019 19:57:17 +0100

> IPv6 does not consider if the socket is bound to a device when binding
> to an address. The result is that a socket can be bound to eth0 and
> then bound to the address of eth1. If the device is a VRF, the result
> is that a socket can only be bound to an address in the default VRF.
> 
> Resolve by considering the device if sk_bound_dev_if is set.
> 
> Signed-off-by: Mike Manning <mmanning@vyatta.att-mail.com>

Applied.
diff mbox series

Patch

diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
index 84dbe21b71e5..96a3559f2a09 100644
--- a/net/ipv6/raw.c
+++ b/net/ipv6/raw.c
@@ -287,7 +287,9 @@  static int rawv6_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len)
 			/* Binding to link-local address requires an interface */
 			if (!sk->sk_bound_dev_if)
 				goto out_unlock;
+		}
 
+		if (sk->sk_bound_dev_if) {
 			err = -ENODEV;
 			dev = dev_get_by_index_rcu(sock_net(sk),
 						   sk->sk_bound_dev_if);