From: Joel Granados via B4 Relay <devnull+j.granados.samsung.com@kernel.org> To: "David S. Miller" <davem@davemloft.net>, Eric Dumazet <edumazet@google.com>, Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>, Alexander Aring <alex.aring@gmail.com>, Stefan Schmidt <stefan@datenfreihafen.org>, Miquel Raynal <miquel.raynal@bootlin.com>, David Ahern <dsahern@kernel.org>, Steffen Klassert <steffen.klassert@secunet.com>, Herbert Xu <herbert@gondor.apana.org.au>, Matthieu Baerts <matttbe@kernel.org>, Mat Martineau <martineau@kernel.org>, Geliang Tang <geliang@kernel.org>, Ralf Baechle <ralf@linux-mips.org>, Remi Denis-Courmont <courmisch@gmail.com>, Allison Henderson <allison.henderson@oracle.com>, David Howells <dhowells@redhat.com>, Marc Dionne <marc.dionne@auristor.com>, Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>, Xin Long <lucien.xin@gmail.com>, Wenjia Zhang <wenjia@linux.ibm.com>, Jan Karcher <jaka@linux.ibm.com>, "D. Wythe" <alibuda@linux.alibaba.com>, Tony Lu <tonylu@linux.alibaba.com>, Wen Gu <guwen@linux.alibaba.com>, Trond Myklebust <trond.myklebust@hammerspace.com>, Anna Schumaker <anna@kernel.org>, Chuck Lever <chuck.lever@oracle.com>, Jeff Layton <jlayton@kernel.org>, Neil Brown <neilb@suse.de>, Olga Kornievskaia <kolga@netapp.com>, Dai Ngo <Dai.Ngo@oracle.com>, Tom Talpey <tom@talpey.com>, Jon Maloy <jmaloy@redhat.com>, Ying Xue <ying.xue@windriver.com>, Martin Schiller <ms@dev.tdt.de>, Pablo Neira Ayuso <pablo@netfilter.org>, Jozsef Kadlecsik <kadlec@netfilter.org>, Florian Westphal <fw@strlen.de>, Roopa Prabhu <roopa@nvidia.com>, Nikolay Aleksandrov <razor@blackwall.org>, Simon Horman <horms@verge.net.au>, Julian Anastasov <ja@ssi.bg>, Joerg Reuter <jreuter@yaina.de>, Luis Chamberlain <mcgrof@kernel.org>, Kees Cook <keescook@chromium.org> Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, dccp@vger.kernel.org, linux-wpan@vger.kernel.org, mptcp@lists.linux.dev, linux-hams@vger.kernel.org, linux-rdma@vger.kernel.org, rds-devel@oss.oracle.com, linux-afs@lists.infradead.org, linux-sctp@vger.kernel.org, linux-s390@vger.kernel.org, linux-nfs@vger.kernel.org, tipc-discussion@lists.sourceforge.net, linux-x25@vger.kernel.org, netfilter-devel@vger.kernel.org, coreteam@netfilter.org, bridge@lists.linux.dev, lvs-devel@vger.kernel.org, Joel Granados <j.granados@samsung.com> Subject: [PATCH 4/4] ax.25: Remove the now superfluous sentinel elements from ctl_table array Date: Thu, 14 Mar 2024 20:20:44 +0100 [thread overview] Message-ID: <20240314-jag-sysctl_remset_net-v1-4-aa26b44d29d9@samsung.com> (raw) In-Reply-To: <20240314-jag-sysctl_remset_net-v1-0-aa26b44d29d9@samsung.com> From: Joel Granados <j.granados@samsung.com> 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. 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@samsung.com> --- net/ax25/sysctl_net_ax25.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/net/ax25/sysctl_net_ax25.c b/net/ax25/sysctl_net_ax25.c index db66e11e7fe8..2ee375a6a69c 100644 --- a/net/ax25/sysctl_net_ax25.c +++ b/net/ax25/sysctl_net_ax25.c @@ -141,8 +141,7 @@ static const struct ctl_table ax25_param_table[] = { .extra2 = &max_ds_timeout }, #endif - - { } /* that's all, folks! */ +/* that's all, folks! */ }; int ax25_register_dev_sysctl(ax25_dev *ax25_dev) @@ -155,7 +154,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
WARNING: multiple messages have this Message-ID (diff)
From: Joel Granados <j.granados@samsung.com> To: "David S. Miller" <davem@davemloft.net>, Eric Dumazet <edumazet@google.com>, Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>, Alexander Aring <alex.aring@gmail.com>, Stefan Schmidt <stefan@datenfreihafen.org>, Miquel Raynal <miquel.raynal@bootlin.com>, David Ahern <dsahern@kernel.org>, Steffen Klassert <steffen.klassert@secunet.com>, Herbert Xu <herbert@gondor.apana.org.au>, Matthieu Baerts <matttbe@kernel.org>, Mat Martineau <martineau@kernel.org>, Geliang Tang <geliang@kernel.org>, Ralf Baechle <ralf@linux-mips.org>, Remi Denis-Courmont <courmisch@gmail.com>, Allison Henderson <allison.henderson@oracle.com>, David Howells <dhowells@redhat.com>, Marc Dionne <marc.dionne@auristor.com>, Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>, Xin Long <lucien.xin@gmail.com>, Wenjia Zhang <wenjia@linux.ibm.com>, Jan Karcher <jaka@linux.ibm.com>, "D. Wythe" <alibuda@linux.alibaba.com>, Tony Lu <tonylu@linux.alibaba.com>, Wen Gu <guwen@linux.alibaba.com>, Trond Myklebust <trond.myklebust@hammerspace.com>, Anna Schumaker <anna@kernel.org>, Chuck Lever <chuck.lever@oracle.com>, Jeff Layton <jlayton@kernel.org>, Neil Brown <neilb@suse.de>, Olga Kornievskaia <kolga@netapp.com>, Dai Ngo <Dai.Ngo@oracle.com>, Tom Talpey <tom@talpey.com>, Jon Maloy <jmaloy@redhat.com>, Ying Xue <ying.xue@windriver.com>, Martin Schiller <ms@dev.tdt.de>, Pablo Neira Ayuso <pablo@netfilter.org>, Jozsef Kadlecsik <kadlec@netfilter.org>, Florian Westphal <fw@strlen.de>, Roopa Prabhu <roopa@nvidia.com>, Nikolay Aleksandrov <razor@blackwall.org>, Simon Horman <horms@verge.net.au>, Julian Anastasov <ja@ssi.bg>, Joerg Reuter <jreuter@yaina.de>, Luis Chamberlain <mcgrof@kernel.org>, Kees Cook <keescook@chromium.org> Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, dccp@vger.kernel.org, linux-wpan@vger.kernel.org, mptcp@lists.linux.dev, linux-hams@vger.kernel.org, linux-rdma@vger.kernel.org, rds-devel@oss.oracle.com, linux-afs@lists.infradead.org, linux-sctp@vger.kernel.org, linux-s390@vger.kernel.org, linux-nfs@vger.kernel.org, tipc-discussion@lists.sourceforge.net, linux-x25@vger.kernel.org, netfilter-devel@vger.kernel.org, coreteam@netfilter.org, bridge@lists.linux.dev, lvs-devel@vger.kernel.org, Joel Granados <j.granados@samsung.com> Subject: [PATCH 4/4] ax.25: Remove the now superfluous sentinel elements from ctl_table array Date: Thu, 14 Mar 2024 20:20:44 +0100 [thread overview] Message-ID: <20240314-jag-sysctl_remset_net-v1-4-aa26b44d29d9@samsung.com> (raw) In-Reply-To: <20240314-jag-sysctl_remset_net-v1-0-aa26b44d29d9@samsung.com> 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. 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@samsung.com> --- net/ax25/sysctl_net_ax25.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/net/ax25/sysctl_net_ax25.c b/net/ax25/sysctl_net_ax25.c index db66e11e7fe8..2ee375a6a69c 100644 --- a/net/ax25/sysctl_net_ax25.c +++ b/net/ax25/sysctl_net_ax25.c @@ -141,8 +141,7 @@ static const struct ctl_table ax25_param_table[] = { .extra2 = &max_ds_timeout }, #endif - - { } /* that's all, folks! */ +/* that's all, folks! */ }; int ax25_register_dev_sysctl(ax25_dev *ax25_dev) @@ -155,7 +154,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
next prev parent reply other threads:[~2024-03-14 19:20 UTC|newest] Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top 2024-03-14 19:20 [PATCH 0/4] sysctl: Remove sentinel elements from networking Joel Granados via B4 Relay 2024-03-14 19:20 ` Joel Granados 2024-03-14 19:20 ` [PATCH 1/4] networking: Remove the now superfluous sentinel elements from ctl_table array Joel Granados via B4 Relay 2024-03-14 19:20 ` Joel Granados 2024-03-14 19:20 ` [PATCH 2/4] netfilter: " Joel Granados via B4 Relay 2024-03-14 19:20 ` Joel Granados 2024-03-14 19:20 ` [PATCH 3/4] appletalk: " Joel Granados via B4 Relay 2024-03-14 19:20 ` Joel Granados 2024-03-14 19:20 ` Joel Granados via B4 Relay [this message] 2024-03-14 19:20 ` [PATCH 4/4] ax.25: " Joel Granados 2024-03-14 22:42 ` [PATCH 0/4] sysctl: Remove sentinel elements from networking Jakub Kicinski 2024-03-15 14:58 ` Joel Granados
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=20240314-jag-sysctl_remset_net-v1-4-aa26b44d29d9@samsung.com \ --to=devnull+j.granados.samsung.com@kernel.org \ --cc=Dai.Ngo@oracle.com \ --cc=alex.aring@gmail.com \ --cc=alibuda@linux.alibaba.com \ --cc=allison.henderson@oracle.com \ --cc=anna@kernel.org \ --cc=bridge@lists.linux.dev \ --cc=chuck.lever@oracle.com \ --cc=coreteam@netfilter.org \ --cc=courmisch@gmail.com \ --cc=davem@davemloft.net \ --cc=dccp@vger.kernel.org \ --cc=dhowells@redhat.com \ --cc=dsahern@kernel.org \ --cc=edumazet@google.com \ --cc=fw@strlen.de \ --cc=geliang@kernel.org \ --cc=guwen@linux.alibaba.com \ --cc=herbert@gondor.apana.org.au \ --cc=horms@verge.net.au \ --cc=j.granados@samsung.com \ --cc=ja@ssi.bg \ --cc=jaka@linux.ibm.com \ --cc=jlayton@kernel.org \ --cc=jmaloy@redhat.com \ --cc=jreuter@yaina.de \ --cc=kadlec@netfilter.org \ --cc=keescook@chromium.org \ --cc=kolga@netapp.com \ --cc=kuba@kernel.org \ --cc=linux-afs@lists.infradead.org \ --cc=linux-hams@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-nfs@vger.kernel.org \ --cc=linux-rdma@vger.kernel.org \ --cc=linux-s390@vger.kernel.org \ --cc=linux-sctp@vger.kernel.org \ --cc=linux-wpan@vger.kernel.org \ --cc=linux-x25@vger.kernel.org \ --cc=lucien.xin@gmail.com \ --cc=lvs-devel@vger.kernel.org \ --cc=marc.dionne@auristor.com \ --cc=marcelo.leitner@gmail.com \ --cc=martineau@kernel.org \ --cc=matttbe@kernel.org \ --cc=mcgrof@kernel.org \ --cc=miquel.raynal@bootlin.com \ --cc=mptcp@lists.linux.dev \ --cc=ms@dev.tdt.de \ --cc=neilb@suse.de \ --cc=netdev@vger.kernel.org \ --cc=netfilter-devel@vger.kernel.org \ --cc=pabeni@redhat.com \ --cc=pablo@netfilter.org \ --cc=ralf@linux-mips.org \ --cc=razor@blackwall.org \ --cc=rds-devel@oss.oracle.com \ --cc=roopa@nvidia.com \ --cc=stefan@datenfreihafen.org \ --cc=steffen.klassert@secunet.com \ --cc=tipc-discussion@lists.sourceforge.net \ --cc=tom@talpey.com \ --cc=tonylu@linux.alibaba.com \ --cc=trond.myklebust@hammerspace.com \ --cc=wenjia@linux.ibm.com \ --cc=ying.xue@windriver.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.