sysctl: Add a size arg to __register_sysctl_table

We make these changes in order to prepare __register_sysctl_table and
its callers for when we remove the sentinel element (empty element at
the end of ctl_table arrays). We don't actually remove any sentinels in
this commit, but we *do* make sure to use ARRAY_SIZE so the table_size
is available when the removal occurs.

We add a table_size argument to __register_sysctl_table and adjust
callers, all of which pass ctl_table pointers and need an explicit call
to ARRAY_SIZE. We implement a size calculation in register_net_sysctl in
order to forward the size of the array pointer received from the network
register calls.

The new table_size argument does not yet have any effect in the
init_header call which is still dependent on the sentinel's presence.
table_size *does* however drive the `kzalloc` allocation in
__register_sysctl_table with no adverse effects as the allocated memory
is either one element greater than the calculated ctl_table array (for
the calls in ipc_sysctl.c, mq_sysctl.c and ucount.c) or the exact size
of the calculated ctl_table array (for the call from sysctl_net.c and
register_sysctl). This approach will allows us to "just" remove the
sentinel without further changes to __register_sysctl_table as
table_size will represent the exact size for all the callers at that
point.

Signed-off-by: Joel Granados <j.granados@samsung.com>
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>

diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
index fa1438f1a35551dd79846a72b51ccbc5dafbe430..b8dd78e344ff41a25bfec5c25414e76e3e5c1406 100644 (file)
--- a/fs/proc/proc_sysctl.c
+++ b/fs/proc/proc_sysctl.c
@@ -1312,6 +1312,7 @@ static struct ctl_dir *sysctl_mkdir_p(struct ctl_dir *dir, const char *path)
  *      should not be free'd after registration. So it should not be
  *      used on stack. It can either be a global or dynamically allocated
  *      by the caller and free'd later after sysctl unregistration.
+ * @table_size : The number of elements in table
  *
  * Register a sysctl table hierarchy. @table should be a filled in ctl_table
  * array. A completely 0 filled entry terminates the table.
@@ -1354,27 +1355,20 @@ static struct ctl_dir *sysctl_mkdir_p(struct ctl_dir *dir, const char *path)
  */
 struct ctl_table_header *__register_sysctl_table(
        struct ctl_table_set *set,
-       const char *path, struct ctl_table *table)
+       const char *path, struct ctl_table *table, size_t table_size)
 {
        struct ctl_table_root *root = set->dir.header.root;
        struct ctl_table_header *header;
-       struct ctl_table_header h_tmp;
        struct ctl_dir *dir;
-       struct ctl_table *entry;
        struct ctl_node *node;
-       int nr_entries = 0;
-
-       h_tmp.ctl_table = table;
-       list_for_each_table_entry(entry, (&h_tmp))
-               nr_entries++;
 
        header = kzalloc(sizeof(struct ctl_table_header) +
-                        sizeof(struct ctl_node)*nr_entries, GFP_KERNEL_ACCOUNT);
+                        sizeof(struct ctl_node)*table_size, GFP_KERNEL_ACCOUNT);
        if (!header)
                return NULL;
 
        node = (struct ctl_node *)(header + 1);
-       init_header(header, root, set, node, table, nr_entries);
+       init_header(header, root, set, node, table, table_size);
        if (sysctl_check_table(path, header))
                goto fail;
 
@@ -1423,8 +1417,15 @@ fail:
  */
 struct ctl_table_header *register_sysctl(const char *path, struct ctl_table *table)
 {
+       int count = 0;
+       struct ctl_table *entry;
+       struct ctl_table_header t_hdr;
+
+       t_hdr.ctl_table = table;
+       list_for_each_table_entry(entry, (&t_hdr))
+               count++;
        return __register_sysctl_table(&sysctl_table_root.default_set,
-                                       path, table);
+                                       path, table, count);
 }
 EXPORT_SYMBOL(register_sysctl);
 

diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index 33252ad58ebefd69dd3bdd37ef40ef6db6e04c07..0495c858989fb1cab30a94b1bd9055c702d06138 100644 (file)
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -226,7 +226,7 @@ extern void retire_sysctl_set(struct ctl_table_set *set);
 
 struct ctl_table_header *__register_sysctl_table(
        struct ctl_table_set *set,
-       const char *path, struct ctl_table *table);
+       const char *path, struct ctl_table *table, size_t table_size);
 struct ctl_table_header *register_sysctl(const char *path, struct ctl_table *table);
 void unregister_sysctl_table(struct ctl_table_header * table);
 

diff --git a/ipc/ipc_sysctl.c b/ipc/ipc_sysctl.c
index ef313ecfb53a12e4f63be71d5b3f6a05afcb79de..8c62e443f78b3cede057e03f13b953c6b0288030 100644 (file)
--- a/ipc/ipc_sysctl.c
+++ b/ipc/ipc_sysctl.c
@@ -259,7 +259,9 @@ bool setup_ipc_sysctls(struct ipc_namespace *ns)
                                tbl[i].data = NULL;
                }
 
-               ns->ipc_sysctls = __register_sysctl_table(&ns->ipc_set, "kernel", tbl);
+               ns->ipc_sysctls = __register_sysctl_table(&ns->ipc_set,
+                                                         "kernel", tbl,
+                                                         ARRAY_SIZE(ipc_sysctls));
        }
        if (!ns->ipc_sysctls) {
                kfree(tbl);

diff --git a/ipc/mq_sysctl.c b/ipc/mq_sysctl.c
index fbf6a8b93a2651f9ae7d1c13288e01f4cfe9abae..ebb5ed81c151a8471f63df3fe61f94de51d30b79 100644 (file)
--- a/ipc/mq_sysctl.c
+++ b/ipc/mq_sysctl.c
@@ -109,7 +109,9 @@ bool setup_mq_sysctls(struct ipc_namespace *ns)
                                tbl[i].data = NULL;
                }
 
-               ns->mq_sysctls = __register_sysctl_table(&ns->mq_set, "fs/mqueue", tbl);
+               ns->mq_sysctls = __register_sysctl_table(&ns->mq_set,
+                                                        "fs/mqueue", tbl,
+                                                        ARRAY_SIZE(mq_sysctls));
        }
        if (!ns->mq_sysctls) {
                kfree(tbl);

diff --git a/kernel/ucount.c b/kernel/ucount.c
index ee8e57fd6f907847d033d2141e5cdaf6e4c18112..2b80264bb79f6b4f58dd573552d3f2d5ab0c0ace 100644 (file)
--- a/kernel/ucount.c
+++ b/kernel/ucount.c
@@ -104,7 +104,8 @@ bool setup_userns_sysctls(struct user_namespace *ns)
                for (i = 0; i < UCOUNT_COUNTS; i++) {
                        tbl[i].data = &ns->ucount_max[i];
                }
-               ns->sysctls = __register_sysctl_table(&ns->set, "user", tbl);
+               ns->sysctls = __register_sysctl_table(&ns->set, "user", tbl,
+                                                     ARRAY_SIZE(user_table));
        }
        if (!ns->sysctls) {
                kfree(tbl);

diff --git a/net/sysctl_net.c b/net/sysctl_net.c
index 4b45ed631eb8b6a1733d9d600c7c3843fbbce0c2..8ee4b74bc009e6d71fa6b5a3d03ffac7b06ec0be 100644 (file)
--- a/net/sysctl_net.c
+++ b/net/sysctl_net.c
@@ -163,10 +163,16 @@ static void ensure_safe_net_sysctl(struct net *net, const char *path,
 struct ctl_table_header *register_net_sysctl(struct net *net,
        const char *path, struct ctl_table *table)
 {
+       int count = 0;
+       struct ctl_table *entry;
+
        if (!net_eq(net, &init_net))
                ensure_safe_net_sysctl(net, path, table);
 
-       return __register_sysctl_table(&net->sysctls, path, table);
+       for (entry = table; entry->procname; entry++)
+               count++;
+
+       return __register_sysctl_table(&net->sysctls, path, table, count);
 }
 EXPORT_SYMBOL_GPL(register_net_sysctl);