Re: [PATCH v5 5/8] net: Remove ctl_table sentinel elements from several networking subsystems

Joel Granados <[email protected]> Mon, 29 Apr 2024 11:10:05 +0200

Newsgroups	org.kernel.vger.dccp,dev.linux.lists.bridge,dev.linux.lists.mptcp,org.kernel.vger.linux-hams,org.kernel.vger.linux-kernel,org.kernel.vger.linux-nfs,org.kernel.vger.linux-rdma,org.kernel.vger.linux-s390,org.kernel.vger.linux-sctp,org.kernel.vger.linux-wpan,org.kernel.vger.linux-x25,org.kernel.vger.lvs-devel,org.kernel.vger.netdev,org.kernel.vger.netfilter-devel
Message-ID	<[email protected]>

On Fri, Apr 26, 2024 at 05:13:37PM +0200, Sabrina Dubroca wrote:
> 2024-04-26, 12:46:57 +0200, Joel Granados via B4 Relay wrote:
> > diff --git a/net/smc/smc_sysctl.c b/net/smc/smc_sysctl.c
> > index a5946d1b9d60..bd0b7e2f8824 100644
> > --- a/net/smc/smc_sysctl.c
> > +++ b/net/smc/smc_sysctl.c
> > @@ -90,7 +90,6 @@ static struct ctl_table smc_table[] = {
> >  		.extra1		= &conns_per_lgr_min,
> >  		.extra2		= &conns_per_lgr_max,
> >  	},
> > -	{  }
> >  };
> 
> There's an ARRAY_SIZE(smc_table) - 1 in smc_sysctl_net_init, shouldn't
> the -1 be removed like you did in other patches?
> 
> 
> int __net_init smc_sysctl_net_init(struct net *net)
> {
> 	struct ctl_table *table;
> 
> 	table = smc_table;
> 	if (!net_eq(net, &init_net)) {
> 		int i;
> 
> 		table = kmemdup(table, sizeof(smc_table), GFP_KERNEL);
> 		if (!table)
> 			goto err_alloc;
> 
> 		for (i = 0; i < ARRAY_SIZE(smc_table) - 1; i++)
This is a very good catch !!!! Thx a lot!! I'll put this into my V6.

> 			table[i].data += (void *)net - (void *)&init_net;
> 	}
> 
> 	net->smc.smc_hdr = register_net_sysctl_sz(net, "net/smc", table,
> 						  ARRAY_SIZE(smc_table));
> [...]
> 
> -- 
> Sabrina
> 

-- 

Joel Granados

signature.asc (application/pgp-signature, 659 B)