From: Willy Tarreau <w@1wt.eu>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: tyler.hicks@canonical.com, luis.henriques@canonical.com,
Michal Tesar <mtesar@redhat.com>,
"David S. Miller" <davem@davemloft.net>, Willy Tarreau <w@1wt.eu>
Subject: [ 9/9] net: fix regression introduced in 2.6.32.62 by sysctl
Date: Sat, 14 Jun 2014 21:12:59 +0200 [thread overview]
Message-ID: <20140614191250.499750488@1wt.eu> (raw)
In-Reply-To: <57d1129d02f4fc14423dd66474950cb7@local>
2.6.32-longterm review patch. If anyone has any objections, please let me know.
------------------
fixes
From: Willy Tarreau <w@1wt.eu>
Commits b7c9e4ee1 ("sysctl net: Keep tcp_syn_retries inside the boundary")
and eedcafdc ("net: check net.core.somaxconn sysctl values") were missing
a .strategy entry which is still required in 2.6.32. Because of this, the
Ubuntu kernel team has faced kernel dumps during their testing.
Tyler Hicks and Luis Henriques proposed this patch to fix the issue,
which properly sets .strategy as needed in 2.6.32.
Reported-by: Luis Henriques <luis.henriques@canonical.com>
Cc: tyler.hicks@canonical.com
Cc: Michal Tesar <mtesar@redhat.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Willy Tarreau <w@1wt.eu>
---
net/core/sysctl_net_core.c | 3 ++-
net/ipv4/sysctl_net_ipv4.c | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c
index e2eaf29..e6bf72c 100644
--- a/net/core/sysctl_net_core.c
+++ b/net/core/sysctl_net_core.c
@@ -121,7 +121,8 @@ static struct ctl_table netns_core_table[] = {
.mode = 0644,
.extra1 = &zero,
.extra2 = &ushort_max,
- .proc_handler = proc_dointvec_minmax
+ .proc_handler = proc_dointvec_minmax,
+ .strategy = &sysctl_intvec
},
{ .ctl_name = 0 }
};
diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
index 910fa54..d957371 100644
--- a/net/ipv4/sysctl_net_ipv4.c
+++ b/net/ipv4/sysctl_net_ipv4.c
@@ -241,7 +241,8 @@ static struct ctl_table ipv4_table[] = {
.mode = 0644,
.proc_handler = proc_dointvec_minmax,
.extra1 = &tcp_syn_retries_min,
- .extra2 = &tcp_syn_retries_max
+ .extra2 = &tcp_syn_retries_max,
+ .strategy = &sysctl_intvec
},
{
.ctl_name = NET_IPV4_NONLOCAL_BIND,
--
1.7.12.2.21.g234cd45.dirty
prev parent reply other threads:[~2014-06-14 20:44 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <57d1129d02f4fc14423dd66474950cb7@local>
2014-06-14 19:12 ` [ 0/9] 2.6.32.63-longterm review Willy Tarreau
2014-06-14 19:12 ` [ 1/9] ethtool: Report link-down while interface is down Willy Tarreau
2014-06-14 19:12 ` [ 2/9] futex: Add another early deadlock detection check Willy Tarreau
2014-06-14 19:12 ` [ 3/9] futex: Prevent attaching to kernel threads Willy Tarreau
2014-06-14 19:12 ` [ 4/9] futex-prevent-requeue-pi-on-same-futex.patch futex: Willy Tarreau
2014-06-14 19:12 ` [ 5/9] futex: Validate atomic acquisition in Willy Tarreau
2014-06-14 19:12 ` [ 6/9] futex: Always cleanup owner tid in unlock_pi Willy Tarreau
2014-06-14 19:12 ` [ 7/9] futex: Make lookup_pi_state more robust Willy Tarreau
2014-06-14 19:12 ` [ 8/9] auditsc: audit_krule mask accesses need bounds checking Willy Tarreau
2014-06-14 19:12 ` Willy Tarreau [this message]
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=20140614191250.499750488@1wt.eu \
--to=w@1wt.eu \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=luis.henriques@canonical.com \
--cc=mtesar@redhat.com \
--cc=stable@vger.kernel.org \
--cc=tyler.hicks@canonical.com \
/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®