| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <b8564ac4-ab65-6212-2241-0843413e05de@ssi.bg>
Date: Tue, 1 Aug 2023 09:11:26 +0300 (EEST)
From: Julian Anastasov <ja@....bg>
To: Joel Granados <joel.granados@...il.com>
cc: mcgrof@...nel.org, Catalin Marinas <catalin.marinas@....com>,
Iurii Zaikin <yzaikin@...gle.com>,
Jozsef Kadlecsik <kadlec@...filter.org>,
Sven Schnelle <svens@...ux.ibm.com>,
Marcelo Ricardo Leitner <marcelo.leitner@...il.com>,
Steffen Klassert <steffen.klassert@...unet.com>,
Kees Cook <keescook@...omium.org>,
"D. Wythe" <alibuda@...ux.alibaba.com>, mptcp@...ts.linux.dev,
Jakub Kicinski <kuba@...nel.org>, Vasily Gorbik <gor@...ux.ibm.com>,
Paolo Abeni <pabeni@...hat.com>, coreteam@...filter.org,
Jan Karcher <jaka@...ux.ibm.com>,
Alexander Aring <alex.aring@...il.com>, Will Deacon <will@...nel.org>,
Stefan Schmidt <stefan@...enfreihafen.org>,
Matthieu Baerts <matthieu.baerts@...sares.net>,
bridge@...ts.linux-foundation.org,
linux-arm-kernel@...ts.infradead.org, Joerg Reuter <jreuter@...na.de>,
David Ahern <dsahern@...nel.org>, netfilter-devel@...r.kernel.org,
Wen Gu <guwen@...ux.alibaba.com>, linux-kernel@...r.kernel.org,
Santosh Shilimkar <santosh.shilimkar@...cle.com>,
linux-wpan@...r.kernel.org, lvs-devel@...r.kernel.org,
Karsten Graul <kgraul@...ux.ibm.com>,
Miquel Raynal <miquel.raynal@...tlin.com>,
Herbert Xu <herbert@...dor.apana.org.au>, linux-sctp@...r.kernel.org,
Tony Lu <tonylu@...ux.alibaba.com>,
Pablo Neira Ayuso <pablo@...filter.org>,
Ralf Baechle <ralf@...ux-mips.org>, Florian Westphal <fw@...len.de>,
willy@...radead.org, Heiko Carstens <hca@...ux.ibm.com>,
"David S. Miller" <davem@...emloft.net>, linux-rdma@...r.kernel.org,
Roopa Prabhu <roopa@...dia.com>,
Alexander Gordeev <agordeev@...ux.ibm.com>,
Simon Horman <horms@...ge.net.au>,
Mat Martineau <martineau@...nel.org>, josh@...htriplett.org,
Christian Borntraeger <borntraeger@...ux.ibm.com>,
Eric Dumazet <edumazet@...gle.com>, linux-hams@...r.kernel.org,
Wenjia Zhang <wenjia@...ux.ibm.com>, linux-fsdevel@...r.kernel.org,
linux-s390@...r.kernel.org, Xin Long <lucien.xin@...il.com>,
Nikolay Aleksandrov <razor@...ckwall.org>, netdev@...r.kernel.org,
rds-devel@....oracle.com, Joel Granados <j.granados@...sung.com>
Subject: Re: [PATCH v2 10/14] netfilter: Update to register_net_sysctl_sz
Hello,
On Mon, 31 Jul 2023, Joel Granados wrote:
> Move from register_net_sysctl to register_net_sysctl_sz for all the
> netfilter related files. Do this while making sure to mirror the NULL
> assignments with a table_size of zero for the unprivileged users.
>
> We need to move to the new function in preparation for when we change
> SIZE_MAX to ARRAY_SIZE() in the register_net_sysctl macro. Failing to do
> so would erroneously allow ARRAY_SIZE() to be called on a pointer. We
> hold off the SIZE_MAX to ARRAY_SIZE change until we have migrated all
> the relevant net sysctl registering functions to register_net_sysctl_sz
> in subsequent commits.
>
> Signed-off-by: Joel Granados <j.granados@...sung.com>
The IPVS part in net/netfilter/ipvs/ looks good to me, thanks!
Acked-by: Julian Anastasov <ja@....bg>
> ---
> net/bridge/br_netfilter_hooks.c | 3 ++-
> net/ipv6/netfilter/nf_conntrack_reasm.c | 3 ++-
> net/netfilter/ipvs/ip_vs_ctl.c | 8 ++++++--
> net/netfilter/ipvs/ip_vs_lblc.c | 10 +++++++---
> net/netfilter/ipvs/ip_vs_lblcr.c | 10 +++++++---
> net/netfilter/nf_conntrack_standalone.c | 4 +++-
> net/netfilter/nf_log.c | 7 ++++---
> 7 files changed, 31 insertions(+), 14 deletions(-)
>
...
> --- a/net/netfilter/ipvs/ip_vs_ctl.c
> +++ b/net/netfilter/ipvs/ip_vs_ctl.c
> @@ -4266,6 +4266,7 @@ static int __net_init ip_vs_control_net_init_sysctl(struct netns_ipvs *ipvs)
> struct net *net = ipvs->net;
> struct ctl_table *tbl;
> int idx, ret;
> + size_t ctl_table_size = ARRAY_SIZE(vs_vars);
>
> atomic_set(&ipvs->dropentry, 0);
> spin_lock_init(&ipvs->dropentry_lock);
> @@ -4282,8 +4283,10 @@ static int __net_init ip_vs_control_net_init_sysctl(struct netns_ipvs *ipvs)
> return -ENOMEM;
>
> /* Don't export sysctls to unprivileged users */
> - if (net->user_ns != &init_user_ns)
> + if (net->user_ns != &init_user_ns) {
> tbl[0].procname = NULL;
> + ctl_table_size = 0;
> + }
> } else
> tbl = vs_vars;
> /* Initialize sysctl defaults */
> @@ -4353,7 +4356,8 @@ static int __net_init ip_vs_control_net_init_sysctl(struct netns_ipvs *ipvs)
> #endif
>
> ret = -ENOMEM;
> - ipvs->sysctl_hdr = register_net_sysctl(net, "net/ipv4/vs", tbl);
> + ipvs->sysctl_hdr = register_net_sysctl_sz(net, "net/ipv4/vs", tbl,
> + ctl_table_size);
> if (!ipvs->sysctl_hdr)
> goto err;
> ipvs->sysctl_tbl = tbl;
> diff --git a/net/netfilter/ipvs/ip_vs_lblc.c b/net/netfilter/ipvs/ip_vs_lblc.c
> index 1b87214d385e..cf78ba4ce5ff 100644
> --- a/net/netfilter/ipvs/ip_vs_lblc.c
> +++ b/net/netfilter/ipvs/ip_vs_lblc.c
> @@ -550,6 +550,7 @@ static struct ip_vs_scheduler ip_vs_lblc_scheduler = {
> static int __net_init __ip_vs_lblc_init(struct net *net)
> {
> struct netns_ipvs *ipvs = net_ipvs(net);
> + size_t vars_table_size = ARRAY_SIZE(vs_vars_table);
>
> if (!ipvs)
> return -ENOENT;
> @@ -562,16 +563,19 @@ static int __net_init __ip_vs_lblc_init(struct net *net)
> return -ENOMEM;
>
> /* Don't export sysctls to unprivileged users */
> - if (net->user_ns != &init_user_ns)
> + if (net->user_ns != &init_user_ns) {
> ipvs->lblc_ctl_table[0].procname = NULL;
> + vars_table_size = 0;
> + }
>
> } else
> ipvs->lblc_ctl_table = vs_vars_table;
> ipvs->sysctl_lblc_expiration = DEFAULT_EXPIRATION;
> ipvs->lblc_ctl_table[0].data = &ipvs->sysctl_lblc_expiration;
>
> - ipvs->lblc_ctl_header =
> - register_net_sysctl(net, "net/ipv4/vs", ipvs->lblc_ctl_table);
> + ipvs->lblc_ctl_header = register_net_sysctl_sz(net, "net/ipv4/vs",
> + ipvs->lblc_ctl_table,
> + vars_table_size);
> if (!ipvs->lblc_ctl_header) {
> if (!net_eq(net, &init_net))
> kfree(ipvs->lblc_ctl_table);
> diff --git a/net/netfilter/ipvs/ip_vs_lblcr.c b/net/netfilter/ipvs/ip_vs_lblcr.c
> index ad8f5fea6d3a..9eddf118b40e 100644
> --- a/net/netfilter/ipvs/ip_vs_lblcr.c
> +++ b/net/netfilter/ipvs/ip_vs_lblcr.c
> @@ -736,6 +736,7 @@ static struct ip_vs_scheduler ip_vs_lblcr_scheduler =
> static int __net_init __ip_vs_lblcr_init(struct net *net)
> {
> struct netns_ipvs *ipvs = net_ipvs(net);
> + size_t vars_table_size = ARRAY_SIZE(vs_vars_table);
>
> if (!ipvs)
> return -ENOENT;
> @@ -748,15 +749,18 @@ static int __net_init __ip_vs_lblcr_init(struct net *net)
> return -ENOMEM;
>
> /* Don't export sysctls to unprivileged users */
> - if (net->user_ns != &init_user_ns)
> + if (net->user_ns != &init_user_ns) {
> ipvs->lblcr_ctl_table[0].procname = NULL;
> + vars_table_size = 0;
> + }
> } else
> ipvs->lblcr_ctl_table = vs_vars_table;
> ipvs->sysctl_lblcr_expiration = DEFAULT_EXPIRATION;
> ipvs->lblcr_ctl_table[0].data = &ipvs->sysctl_lblcr_expiration;
>
> - ipvs->lblcr_ctl_header =
> - register_net_sysctl(net, "net/ipv4/vs", ipvs->lblcr_ctl_table);
> + ipvs->lblcr_ctl_header = register_net_sysctl_sz(net, "net/ipv4/vs",
> + ipvs->lblcr_ctl_table,
> + vars_table_size);
> if (!ipvs->lblcr_ctl_header) {
> if (!net_eq(net, &init_net))
> kfree(ipvs->lblcr_ctl_table);
Regards
--
Julian Anastasov <ja@....bg>
Powered by blists - more mailing lists