Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Wed, 06 Jan 2021 20:40:28 +0000
To:     "David S. Miller" <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>
From:   Alexander Lobakin <alobakin@pm.me>
Cc:     Alexander Lobakin <alobakin@pm.me>, netdev@vger.kernel.org,
        linux-kernel@vger.kernel.org
Reply-To: Alexander Lobakin <alobakin@pm.me>
Subject: [PATCH net-next] net: sysctl: cleanup net_sysctl_init()
Message-ID: <20210106204014.34730-1-alobakin@pm.me>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

'net_header' is not used outside of this function, so can be moved
from BSS onto the stack.
Declarations of one-element arrays are discouraged, and there's no
need to store 'empty' in BSS. Simply allocate it from heap at init.

Signed-off-by: Alexander Lobakin <alobakin@pm.me>
---
 net/sysctl_net.c | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/net/sysctl_net.c b/net/sysctl_net.c
index d14dab8b6774..4cf81800a907 100644
--- a/net/sysctl_net.c
+++ b/net/sysctl_net.c
@@ -92,27 +92,34 @@ static struct pernet_operations sysctl_pernet_ops =3D {
 =09.exit =3D sysctl_net_exit,
 };
=20
-static struct ctl_table_header *net_header;
 __init int net_sysctl_init(void)
 {
-=09static struct ctl_table empty[1];
+=09struct ctl_table_header *net_header;
+=09struct ctl_table *empty;
 =09int ret =3D -ENOMEM;
+
 =09/* Avoid limitations in the sysctl implementation by
 =09 * registering "/proc/sys/net" as an empty directory not in a
 =09 * network namespace.
 =09 */
+
+=09empty =3D kzalloc(sizeof(*empty), GFP_KERNEL);
+=09if (!empty)
+=09=09return ret;
+
 =09net_header =3D register_sysctl("net", empty);
 =09if (!net_header)
-=09=09goto out;
+=09=09goto err_free;
+
 =09ret =3D register_pernet_subsys(&sysctl_pernet_ops);
-=09if (ret)
-=09=09goto out1;
-out:
-=09return ret;
-out1:
+=09if (!ret)
+=09=09return 0;
+
 =09unregister_sysctl_table(net_header);
-=09net_header =3D NULL;
-=09goto out;
+err_free:
+=09kfree(empty);
+
+=09return ret;
 }
=20
 struct ctl_table_header *register_net_sysctl(struct net *net,
--=20
2.30.0