From: Josef Bacik <josef@toxicpanda.com>
To: davem@davemloft.net, netdev@vger.kernel.org, kernel-team@fb.com,
linux-kernel@vger.kernel.org
Cc: Josef Bacik <jbacik@fb.com>
Subject: [PATCH 1/3] net: set tb->fast_sk_family
Date: Fri, 22 Sep 2017 20:20:06 -0400 [thread overview]
Message-ID: <1506126008-9148-2-git-send-email-josef@toxicpanda.com> (raw)
In-Reply-To: <1506126008-9148-1-git-send-email-josef@toxicpanda.com>
From: Josef Bacik <jbacik@fb.com>
We need to set the tb->fast_sk_family properly so we can use the proper
comparison function for all subsequent reuseport bind requests.
Fixes: 637bc8bbe6c0 ("inet: reset tb->fastreuseport when adding a reuseport sk")
Reported-and-tested-by: Cole Robinson <crobinso@redhat.com>
Signed-off-by: Josef Bacik <jbacik@fb.com>
---
net/ipv4/inet_connection_sock.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c
index b9c64b40a83a..f87f4805e244 100644
--- a/net/ipv4/inet_connection_sock.c
+++ b/net/ipv4/inet_connection_sock.c
@@ -328,6 +328,7 @@ int inet_csk_get_port(struct sock *sk, unsigned short snum)
tb->fastuid = uid;
tb->fast_rcv_saddr = sk->sk_rcv_saddr;
tb->fast_ipv6_only = ipv6_only_sock(sk);
+ tb->fast_sk_family = sk->sk_family;
#if IS_ENABLED(CONFIG_IPV6)
tb->fast_v6_rcv_saddr = sk->sk_v6_rcv_saddr;
#endif
@@ -354,6 +355,7 @@ int inet_csk_get_port(struct sock *sk, unsigned short snum)
tb->fastuid = uid;
tb->fast_rcv_saddr = sk->sk_rcv_saddr;
tb->fast_ipv6_only = ipv6_only_sock(sk);
+ tb->fast_sk_family = sk->sk_family;
#if IS_ENABLED(CONFIG_IPV6)
tb->fast_v6_rcv_saddr = sk->sk_v6_rcv_saddr;
#endif
--
2.7.4
next prev parent reply other threads:[~2017-09-23 0:20 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-23 0:20 [PATCH 0/3] fix reuseaddr regression Josef Bacik
2017-09-23 0:20 ` Josef Bacik [this message]
2017-09-23 0:20 ` [PATCH 2/3] net: use inet6_rcv_saddr to compare sockets Josef Bacik
2017-09-23 0:20 ` [PATCH 3/3] inet: fix improper empty comparison Josef Bacik
2017-09-23 3:40 ` [PATCH 0/3] fix reuseaddr regression David Miller
-- strict thread matches above, loose matches on Subject: below --
2017-09-18 16:28 josef
2017-09-18 16:28 ` [PATCH 1/3] net: set tb->fast_sk_family josef
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1506126008-9148-2-git-send-email-josef@toxicpanda.com \
--to=josef@toxicpanda.com \
--cc=davem@davemloft.net \
--cc=jbacik@fb.com \
--cc=kernel-team@fb.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).