* [PATCH] inet: don't use sk_v6_rcv_saddr directly
@ 2017-01-19 22:47 Josef Bacik
2017-01-20 14:18 ` Josef Bacik
2017-01-20 19:36 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Josef Bacik @ 2017-01-19 22:47 UTC (permalink / raw)
To: davem, tom, netdev, kafai
When comparing two sockets we need to use inet6_rcv_saddr so we get a NULL
sk_v6_rcv_saddr if the socket isn't AF_INET6, otherwise our comparison function
can be wrong.
Fixes: 637bc8b ("inet: reset tb->fastreuseport when adding a reuseport sk")
Signed-off-by: Josef Bacik <jbacik@fb.com>
---
net/ipv4/inet_connection_sock.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c
index 096a085..a336c42 100644
--- a/net/ipv4/inet_connection_sock.c
+++ b/net/ipv4/inet_connection_sock.c
@@ -99,7 +99,7 @@ int inet_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2,
#if IS_ENABLED(CONFIG_IPV6)
if (sk->sk_family == AF_INET6)
return ipv6_rcv_saddr_equal(&sk->sk_v6_rcv_saddr,
- &sk2->sk_v6_rcv_saddr,
+ inet6_rcv_saddr(sk2),
sk->sk_rcv_saddr,
sk2->sk_rcv_saddr,
ipv6_only_sock(sk),
--
2.5.5
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] inet: don't use sk_v6_rcv_saddr directly
2017-01-19 22:47 [PATCH] inet: don't use sk_v6_rcv_saddr directly Josef Bacik
@ 2017-01-20 14:18 ` Josef Bacik
2017-01-20 19:36 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Josef Bacik @ 2017-01-20 14:18 UTC (permalink / raw)
To: davem, tom, netdev, kafai
On Thu, Jan 19, 2017 at 5:47 PM, Josef Bacik <jbacik@fb.com> wrote:
> When comparing two sockets we need to use inet6_rcv_saddr so we get a
> NULL
> sk_v6_rcv_saddr if the socket isn't AF_INET6, otherwise our
> comparison function
> can be wrong.
>
> Fixes: 637bc8b ("inet: reset tb->fastreuseport when adding a
> reuseport sk")
> Signed-off-by: Josef Bacik <jbacik@fb.com>
> ---
> net/ipv4/inet_connection_sock.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/net/ipv4/inet_connection_sock.c
> b/net/ipv4/inet_connection_sock.c
> index 096a085..a336c42 100644
> --- a/net/ipv4/inet_connection_sock.c
> +++ b/net/ipv4/inet_connection_sock.c
> @@ -99,7 +99,7 @@ int inet_rcv_saddr_equal(const struct sock *sk,
> const struct sock *sk2,
> #if IS_ENABLED(CONFIG_IPV6)
> if (sk->sk_family == AF_INET6)
> return ipv6_rcv_saddr_equal(&sk->sk_v6_rcv_saddr,
> - &sk2->sk_v6_rcv_saddr,
> + inet6_rcv_saddr(sk2),
> sk->sk_rcv_saddr,
> sk2->sk_rcv_saddr,
> ipv6_only_sock(sk),
> --
> 2.5.5
Sorry I forgot to tag this, it's for net-next. Thanks,
Josef
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] inet: don't use sk_v6_rcv_saddr directly
2017-01-19 22:47 [PATCH] inet: don't use sk_v6_rcv_saddr directly Josef Bacik
2017-01-20 14:18 ` Josef Bacik
@ 2017-01-20 19:36 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2017-01-20 19:36 UTC (permalink / raw)
To: jbacik; +Cc: tom, netdev, kafai
From: Josef Bacik <jbacik@fb.com>
Date: Thu, 19 Jan 2017 17:47:46 -0500
> When comparing two sockets we need to use inet6_rcv_saddr so we get a NULL
> sk_v6_rcv_saddr if the socket isn't AF_INET6, otherwise our comparison function
> can be wrong.
>
> Fixes: 637bc8b ("inet: reset tb->fastreuseport when adding a reuseport sk")
> Signed-off-by: Josef Bacik <jbacik@fb.com>
Applied, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-01-20 19:36 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-01-19 22:47 [PATCH] inet: don't use sk_v6_rcv_saddr directly Josef Bacik
2017-01-20 14:18 ` Josef Bacik
2017-01-20 19:36 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.