forked from mirrors/linux
		
	 1751f872cc
			
		
	
	
		1751f872cc
		
	
	
	
	
		
			
			Add the const qualifier to all the ctl_tables in the tree except for
watchdog_hardlockup_sysctl, memory_allocation_profiling_sysctls,
loadpin_sysctl_table and the ones calling register_net_sysctl (./net,
drivers/inifiniband dirs). These are special cases as they use a
registration function with a non-const qualified ctl_table argument or
modify the arrays before passing them on to the registration function.
Constifying ctl_table structs will prevent the modification of
proc_handler function pointers as the arrays would reside in .rodata.
This is made possible after commit 78eb4ea25c ("sysctl: treewide:
constify the ctl_table argument of proc_handlers") constified all the
proc_handlers.
Created this by running an spatch followed by a sed command:
Spatch:
    virtual patch
    @
    depends on !(file in "net")
    disable optional_qualifier
    @
    identifier table_name != {
      watchdog_hardlockup_sysctl,
      iwcm_ctl_table,
      ucma_ctl_table,
      memory_allocation_profiling_sysctls,
      loadpin_sysctl_table
    };
    @@
    + const
    struct ctl_table table_name [] = { ... };
sed:
    sed --in-place \
      -e "s/struct ctl_table .table = &uts_kern/const struct ctl_table *table = \&uts_kern/" \
      kernel/utsname_sysctl.c
Reviewed-by: Song Liu <song@kernel.org>
Acked-by: Steven Rostedt (Google) <rostedt@goodmis.org> # for kernel/trace/
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com> # SCSI
Reviewed-by: Darrick J. Wong <djwong@kernel.org> # xfs
Acked-by: Jani Nikula <jani.nikula@intel.com>
Acked-by: Corey Minyard <cminyard@mvista.com>
Acked-by: Wei Liu <wei.liu@kernel.org>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Bill O'Donnell <bodonnel@redhat.com>
Acked-by: Baoquan He <bhe@redhat.com>
Acked-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
Acked-by: Anna Schumaker <anna.schumaker@oracle.com>
Signed-off-by: Joel Granados <joel.granados@kernel.org>
		
	
			
		
			
				
	
	
		
			167 lines
		
	
	
	
		
			3.9 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			167 lines
		
	
	
	
		
			3.9 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| // SPDX-License-Identifier: GPL-2.0-only
 | |
| /*
 | |
|  *  Copyright (C) 2007 IBM Corporation
 | |
|  *
 | |
|  *  Author: Cedric Le Goater <clg@fr.ibm.com>
 | |
|  */
 | |
| 
 | |
| #include <linux/nsproxy.h>
 | |
| #include <linux/ipc_namespace.h>
 | |
| #include <linux/sysctl.h>
 | |
| 
 | |
| #include <linux/stat.h>
 | |
| #include <linux/capability.h>
 | |
| #include <linux/slab.h>
 | |
| #include <linux/cred.h>
 | |
| 
 | |
| static int msg_max_limit_min = MIN_MSGMAX;
 | |
| static int msg_max_limit_max = HARD_MSGMAX;
 | |
| 
 | |
| static int msg_maxsize_limit_min = MIN_MSGSIZEMAX;
 | |
| static int msg_maxsize_limit_max = HARD_MSGSIZEMAX;
 | |
| 
 | |
| static const struct ctl_table mq_sysctls[] = {
 | |
| 	{
 | |
| 		.procname	= "queues_max",
 | |
| 		.data		= &init_ipc_ns.mq_queues_max,
 | |
| 		.maxlen		= sizeof(int),
 | |
| 		.mode		= 0644,
 | |
| 		.proc_handler	= proc_dointvec,
 | |
| 	},
 | |
| 	{
 | |
| 		.procname	= "msg_max",
 | |
| 		.data		= &init_ipc_ns.mq_msg_max,
 | |
| 		.maxlen		= sizeof(int),
 | |
| 		.mode		= 0644,
 | |
| 		.proc_handler	= proc_dointvec_minmax,
 | |
| 		.extra1		= &msg_max_limit_min,
 | |
| 		.extra2		= &msg_max_limit_max,
 | |
| 	},
 | |
| 	{
 | |
| 		.procname	= "msgsize_max",
 | |
| 		.data		= &init_ipc_ns.mq_msgsize_max,
 | |
| 		.maxlen		= sizeof(int),
 | |
| 		.mode		= 0644,
 | |
| 		.proc_handler	= proc_dointvec_minmax,
 | |
| 		.extra1		= &msg_maxsize_limit_min,
 | |
| 		.extra2		= &msg_maxsize_limit_max,
 | |
| 	},
 | |
| 	{
 | |
| 		.procname	= "msg_default",
 | |
| 		.data		= &init_ipc_ns.mq_msg_default,
 | |
| 		.maxlen		= sizeof(int),
 | |
| 		.mode		= 0644,
 | |
| 		.proc_handler	= proc_dointvec_minmax,
 | |
| 		.extra1		= &msg_max_limit_min,
 | |
| 		.extra2		= &msg_max_limit_max,
 | |
| 	},
 | |
| 	{
 | |
| 		.procname	= "msgsize_default",
 | |
| 		.data		= &init_ipc_ns.mq_msgsize_default,
 | |
| 		.maxlen		= sizeof(int),
 | |
| 		.mode		= 0644,
 | |
| 		.proc_handler	= proc_dointvec_minmax,
 | |
| 		.extra1		= &msg_maxsize_limit_min,
 | |
| 		.extra2		= &msg_maxsize_limit_max,
 | |
| 	},
 | |
| };
 | |
| 
 | |
| static struct ctl_table_set *set_lookup(struct ctl_table_root *root)
 | |
| {
 | |
| 	return ¤t->nsproxy->ipc_ns->mq_set;
 | |
| }
 | |
| 
 | |
| static int set_is_seen(struct ctl_table_set *set)
 | |
| {
 | |
| 	return ¤t->nsproxy->ipc_ns->mq_set == set;
 | |
| }
 | |
| 
 | |
| static void mq_set_ownership(struct ctl_table_header *head,
 | |
| 			     kuid_t *uid, kgid_t *gid)
 | |
| {
 | |
| 	struct ipc_namespace *ns =
 | |
| 		container_of(head->set, struct ipc_namespace, mq_set);
 | |
| 
 | |
| 	kuid_t ns_root_uid = make_kuid(ns->user_ns, 0);
 | |
| 	kgid_t ns_root_gid = make_kgid(ns->user_ns, 0);
 | |
| 
 | |
| 	*uid = uid_valid(ns_root_uid) ? ns_root_uid : GLOBAL_ROOT_UID;
 | |
| 	*gid = gid_valid(ns_root_gid) ? ns_root_gid : GLOBAL_ROOT_GID;
 | |
| }
 | |
| 
 | |
| static int mq_permissions(struct ctl_table_header *head, const struct ctl_table *table)
 | |
| {
 | |
| 	int mode = table->mode;
 | |
| 	kuid_t ns_root_uid;
 | |
| 	kgid_t ns_root_gid;
 | |
| 
 | |
| 	mq_set_ownership(head, &ns_root_uid, &ns_root_gid);
 | |
| 
 | |
| 	if (uid_eq(current_euid(), ns_root_uid))
 | |
| 		mode >>= 6;
 | |
| 
 | |
| 	else if (in_egroup_p(ns_root_gid))
 | |
| 		mode >>= 3;
 | |
| 
 | |
| 	mode &= 7;
 | |
| 
 | |
| 	return (mode << 6) | (mode << 3) | mode;
 | |
| }
 | |
| 
 | |
| static struct ctl_table_root set_root = {
 | |
| 	.lookup = set_lookup,
 | |
| 	.permissions = mq_permissions,
 | |
| 	.set_ownership = mq_set_ownership,
 | |
| };
 | |
| 
 | |
| bool setup_mq_sysctls(struct ipc_namespace *ns)
 | |
| {
 | |
| 	struct ctl_table *tbl;
 | |
| 
 | |
| 	setup_sysctl_set(&ns->mq_set, &set_root, set_is_seen);
 | |
| 
 | |
| 	tbl = kmemdup(mq_sysctls, sizeof(mq_sysctls), GFP_KERNEL);
 | |
| 	if (tbl) {
 | |
| 		int i;
 | |
| 
 | |
| 		for (i = 0; i < ARRAY_SIZE(mq_sysctls); i++) {
 | |
| 			if (tbl[i].data == &init_ipc_ns.mq_queues_max)
 | |
| 				tbl[i].data = &ns->mq_queues_max;
 | |
| 
 | |
| 			else if (tbl[i].data == &init_ipc_ns.mq_msg_max)
 | |
| 				tbl[i].data = &ns->mq_msg_max;
 | |
| 
 | |
| 			else if (tbl[i].data == &init_ipc_ns.mq_msgsize_max)
 | |
| 				tbl[i].data = &ns->mq_msgsize_max;
 | |
| 
 | |
| 			else if (tbl[i].data == &init_ipc_ns.mq_msg_default)
 | |
| 				tbl[i].data = &ns->mq_msg_default;
 | |
| 
 | |
| 			else if (tbl[i].data == &init_ipc_ns.mq_msgsize_default)
 | |
| 				tbl[i].data = &ns->mq_msgsize_default;
 | |
| 			else
 | |
| 				tbl[i].data = NULL;
 | |
| 		}
 | |
| 
 | |
| 		ns->mq_sysctls = __register_sysctl_table(&ns->mq_set,
 | |
| 							 "fs/mqueue", tbl,
 | |
| 							 ARRAY_SIZE(mq_sysctls));
 | |
| 	}
 | |
| 	if (!ns->mq_sysctls) {
 | |
| 		kfree(tbl);
 | |
| 		retire_sysctl_set(&ns->mq_set);
 | |
| 		return false;
 | |
| 	}
 | |
| 
 | |
| 	return true;
 | |
| }
 | |
| 
 | |
| void retire_mq_sysctls(struct ipc_namespace *ns)
 | |
| {
 | |
| 	const struct ctl_table *tbl;
 | |
| 
 | |
| 	tbl = ns->mq_sysctls->ctl_table_arg;
 | |
| 	unregister_sysctl_table(ns->mq_sysctls);
 | |
| 	retire_sysctl_set(&ns->mq_set);
 | |
| 	kfree(tbl);
 | |
| }
 |