netdev - [PATCH v2 4/4] ax.25: Remove the now superfluous sentinel elements from ctl

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

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date: Thu, 28 Mar 2024 12:49:34 -0700
From: Kuniyuki Iwashima <kuniyu@...zon.com>
To: <devnull+j.granados.samsung.com@...nel.org>
CC: <Dai.Ngo@...cle.com>, <alex.aring@...il.com>, <alibuda@...ux.alibaba.com>,
	<allison.henderson@...cle.com>, <anna@...nel.org>, <bridge@...ts.linux.dev>,
	<chuck.lever@...cle.com>, <coreteam@...filter.org>, <courmisch@...il.com>,
	<davem@...emloft.net>, <dccp@...r.kernel.org>, <dhowells@...hat.com>,
	<dsahern@...nel.org>, <edumazet@...gle.com>, <fw@...len.de>,
	<geliang@...nel.org>, <guwen@...ux.alibaba.com>,
	<herbert@...dor.apana.org.au>, <horms@...ge.net.au>,
	<j.granados@...sung.com>, <ja@....bg>, <jaka@...ux.ibm.com>,
	<jlayton@...nel.org>, <jmaloy@...hat.com>, <jreuter@...na.de>,
	<kadlec@...filter.org>, <keescook@...omium.org>, <kolga@...app.com>,
	<kuba@...nel.org>, <linux-afs@...ts.infradead.org>,
	<linux-hams@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
	<linux-nfs@...r.kernel.org>, <linux-rdma@...r.kernel.org>,
	<linux-s390@...r.kernel.org>, <linux-sctp@...r.kernel.org>,
	<linux-wpan@...r.kernel.org>, <linux-x25@...r.kernel.org>,
	<lucien.xin@...il.com>, <lvs-devel@...r.kernel.org>,
	<marc.dionne@...istor.com>, <marcelo.leitner@...il.com>,
	<martineau@...nel.org>, <matttbe@...nel.org>, <mcgrof@...nel.org>,
	<miquel.raynal@...tlin.com>, <mptcp@...ts.linux.dev>, <ms@....tdt.de>,
	<neilb@...e.de>, <netdev@...r.kernel.org>, <netfilter-devel@...r.kernel.org>,
	<pabeni@...hat.com>, <pablo@...filter.org>, <ralf@...ux-mips.org>,
	<razor@...ckwall.org>, <rds-devel@....oracle.com>, <roopa@...dia.com>,
	<stefan@...enfreihafen.org>, <steffen.klassert@...unet.com>,
	<tipc-discussion@...ts.sourceforge.net>, <tom@...pey.com>,
	<tonylu@...ux.alibaba.com>, <trond.myklebust@...merspace.com>,
	<wenjia@...ux.ibm.com>, <ying.xue@...driver.com>, <kuniyu@...zon.com>
Subject: [PATCH v2 4/4] ax.25: Remove the now superfluous sentinel elements from ctl_table array

From: Joel Granados via B4 Relay <devnull+j.granados.samsung.com@...nel.org>
Date: Thu, 28 Mar 2024 16:40:05 +0100
> This commit comes at the tail end of a greater effort to remove the
> empty elements at the end of the ctl_table arrays (sentinels) which will
> reduce the overall build time size of the kernel and run time memory
> bloat by ~64 bytes per sentinel (further information Link :
> https://lore.kernel.org/all/ZO5Yx5JFogGi%2FcBo@bombadil.infradead.org/)
> 
> When we remove the sentinel from ax25_param_table a buffer overflow
> shows its ugly head. The sentinel's data element used to be changed when
> CONFIG_AX25_DAMA_SLAVE was not defined.

I think it's better to define the relation explicitly between the
enum and sysctl table by BUILD_BUG_ON() in ax25_register_dev_sysctl()

  BUILD_BUG_ON(AX25_MAX_VALUES != ARRAY_SIZE(ax25_param_table));

and guard AX25_VALUES_DS_TIMEOUT with #ifdef CONFIG_AX25_DAMA_SLAVE
as done for other enum.


> This did not have any adverse
> effects as we still stopped on the sentinel because of its null
> procname. But now that we do not have the sentinel element, we are
> careful to check ax25_param_table's size.
> 
> Signed-off-by: Joel Granados <j.granados@...sung.com>
> ---
>  net/ax25/sysctl_net_ax25.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/net/ax25/sysctl_net_ax25.c b/net/ax25/sysctl_net_ax25.c
> index db66e11e7fe8..e55be8817a1e 100644
> --- a/net/ax25/sysctl_net_ax25.c
> +++ b/net/ax25/sysctl_net_ax25.c
> @@ -141,8 +141,6 @@ static const struct ctl_table ax25_param_table[] = {
>  		.extra2		= &max_ds_timeout
>  	},
>  #endif
> -
> -	{ }	/* that's all, folks! */
>  };
>  
>  int ax25_register_dev_sysctl(ax25_dev *ax25_dev)
> @@ -155,7 +153,7 @@ int ax25_register_dev_sysctl(ax25_dev *ax25_dev)
>  	if (!table)
>  		return -ENOMEM;
>  
> -	for (k = 0; k < AX25_MAX_VALUES; k++)
> +	for (k = 0; k < AX25_MAX_VALUES && k < ARRAY_SIZE(ax25_param_table); k++)
>  		table[k].data = &ax25_dev->values[k];
>  
>  	snprintf(path, sizeof(path), "net/ax25/%s", ax25_dev->dev->name);
> 
> -- 
> 2.43.0