From: Pablo Neira Ayuso <pablo@netfilter.org>
To: Jann Horn <jann@thejh.net>
Cc: "David S. Miller" <davem@davemloft.net>,
Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>,
James Morris <jmorris@namei.org>,
Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>,
netdev@vger.kernel.org, netfilter-devel@vger.kernel.org
Subject: Re: [PATCH] netfilter: don't permit unprivileged writes to global state via sysctls
Date: Thu, 20 Oct 2016 20:22:24 +0200 [thread overview]
Message-ID: <20161020182224.GA10999@salvia> (raw)
In-Reply-To: <1474669264-3283-1-git-send-email-jann@thejh.net>
On Sat, Sep 24, 2016 at 12:21:04AM +0200, Jann Horn wrote:
> This prevents the modification of nf_conntrack_max in unprivileged network
> namespaces. For unprivileged network namespaces, ip_conntrack_max is kept
> as a readonly sysctl in order to minimize potential compatibility issues.
>
> This patch should apply cleanly to the net tree.
For the record: This patch looks good to me, but this legacy
ip_conntrack sysctl code is now gone.
I don't know what is the procedure to get this to -stable branches now
that this cannot be pushed upstream.
> Signed-off-by: Jann Horn <jann@thejh.net>
> ---
> net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
> index ae1a71a..a639e94 100644
> --- a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
> +++ b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
> @@ -358,6 +358,9 @@ static int ipv4_init_net(struct net *net)
> if (!in->ctl_table)
> return -ENOMEM;
>
> + if (net->user_ns != &init_user_ns)
> + in->ctl_table[0].mode = 0444;
> +
> in->ctl_table[0].data = &nf_conntrack_max;
> in->ctl_table[1].data = &net->ct.count;
> in->ctl_table[2].data = &nf_conntrack_htable_size;
> --
> 2.1.4
>
next prev parent reply other threads:[~2016-10-20 18:22 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-23 22:21 [PATCH] netfilter: don't permit unprivileged writes to global state via sysctls Jann Horn
2016-10-20 18:22 ` Pablo Neira Ayuso [this message]
2016-10-20 18:37 ` David Miller
2016-10-22 21:23 ` Jann Horn
2016-10-22 22:43 ` David Miller
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=20161020182224.GA10999@salvia \
--to=pablo@netfilter.org \
--cc=davem@davemloft.net \
--cc=jann@thejh.net \
--cc=jmorris@namei.org \
--cc=kuznet@ms2.inr.ac.ru \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=yoshfuji@linux-ipv6.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).