From: Quentin Armitage <quentin@armitage.org.uk>
To: Wensong Zhang <wensong@linux-vs.org>,
Simon Horman <horms@verge.net.au>, Julian Anastasov <ja@ssi.bg>,
Pablo Neira Ayuso <pablo@netfilter.org>,
Patrick McHardy <kaber@trash.net>,
Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>,
"David S. Miller" <davem@davemloft.net>,
netdev@vger.kernel.org, lvs-devel@vger.kernel.org,
netfilter-devel@vger.kernel.org, coreteam@netfilter.org,
linux-kernel@vger.kernel.org
Cc: Quentin Armitage <quentin@armitage.org.uk>
Subject: [PATCH 4/5] ipvs: Lock socket before setting SK_CAN_REUSE
Date: Tue, 14 Jun 2016 02:43:32 +0100 [thread overview]
Message-ID: <1465868613-26146-5-git-send-email-quentin@armitage.org.uk> (raw)
In-Reply-To: <1465868613-26146-1-git-send-email-quentin@armitage.org.uk>
When other settings are changed in the socket it is locked, so
lock the socket before setting SK_CAN_REUSE.
Signed-off-by: Quentin Armitage <quentin@armitage.org.uk>
---
net/netfilter/ipvs/ip_vs_sync.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
index 29d73d8..dfac9ef 100644
--- a/net/netfilter/ipvs/ip_vs_sync.c
+++ b/net/netfilter/ipvs/ip_vs_sync.c
@@ -1540,7 +1540,9 @@ static struct socket *make_receive_sock(struct netns_ipvs *ipvs, int id, int ifi
}
/* it is equivalent to the REUSEADDR option in user-space */
+ lock_sock(sock->sk);
sock->sk->sk_reuse = SK_CAN_REUSE;
+ release_sock(sock->sk);
result = sysctl_sync_sock_size(ipvs);
if (result > 0)
set_sock_size(sock->sk, 0, result);
--
1.7.7.6
next prev parent reply other threads:[~2016-06-14 1:54 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-14 1:43 [PATCH 0/5] ipvs: fix backup sync daemon with IPv6, and minor updates Quentin Armitage
2016-06-14 1:43 ` [PATCH 1/5] ipvs: Enable setting IPv6 multicast address for ipvs sync daemon backup Quentin Armitage
2016-06-14 1:43 ` [PATCH 2/5] ipvs: Stop calling __dev_get_by_name() repeatedly when starting sync daemon Quentin Armitage
2016-06-14 2:14 ` kbuild test robot
2016-06-14 1:43 ` [PATCH 3/5] ipvs: Don't check result < 0 after setting result = 0 Quentin Armitage
2016-06-14 1:43 ` Quentin Armitage [this message]
2016-06-14 3:12 ` [PATCH 4/5] ipvs: Lock socket before setting SK_CAN_REUSE Eric Dumazet
2016-06-14 3:18 ` Eric Dumazet
2016-06-14 1:43 ` [PATCH 5/5] ipvs: log additional sync daemon parameters Quentin Armitage
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=1465868613-26146-5-git-send-email-quentin@armitage.org.uk \
--to=quentin@armitage.org.uk \
--cc=coreteam@netfilter.org \
--cc=davem@davemloft.net \
--cc=horms@verge.net.au \
--cc=ja@ssi.bg \
--cc=kaber@trash.net \
--cc=kadlec@blackhole.kfki.hu \
--cc=linux-kernel@vger.kernel.org \
--cc=lvs-devel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.org \
--cc=wensong@linux-vs.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
all inboxes | Powered by JetHome®