mirror of
				https://github.com/torvalds/linux.git
				synced 2025-10-31 08:38:45 +02:00 
			
		
		
		
	 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>
		
	
			
		
			
				
	
	
		
			144 lines
		
	
	
	
		
			3.4 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			144 lines
		
	
	
	
		
			3.4 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| // SPDX-License-Identifier: GPL-2.0-only
 | |
| /*
 | |
|  *  Copyright (C) 2007
 | |
|  *
 | |
|  *  Author: Eric Biederman <ebiederm@xmision.com>
 | |
|  */
 | |
| 
 | |
| #include <linux/export.h>
 | |
| #include <linux/uts.h>
 | |
| #include <linux/utsname.h>
 | |
| #include <linux/random.h>
 | |
| #include <linux/sysctl.h>
 | |
| #include <linux/wait.h>
 | |
| #include <linux/rwsem.h>
 | |
| 
 | |
| #ifdef CONFIG_PROC_SYSCTL
 | |
| 
 | |
| static void *get_uts(const struct ctl_table *table)
 | |
| {
 | |
| 	char *which = table->data;
 | |
| 	struct uts_namespace *uts_ns;
 | |
| 
 | |
| 	uts_ns = current->nsproxy->uts_ns;
 | |
| 	which = (which - (char *)&init_uts_ns) + (char *)uts_ns;
 | |
| 
 | |
| 	return which;
 | |
| }
 | |
| 
 | |
| /*
 | |
|  *	Special case of dostring for the UTS structure. This has locks
 | |
|  *	to observe. Should this be in kernel/sys.c ????
 | |
|  */
 | |
| static int proc_do_uts_string(const struct ctl_table *table, int write,
 | |
| 		  void *buffer, size_t *lenp, loff_t *ppos)
 | |
| {
 | |
| 	struct ctl_table uts_table;
 | |
| 	int r;
 | |
| 	char tmp_data[__NEW_UTS_LEN + 1];
 | |
| 
 | |
| 	memcpy(&uts_table, table, sizeof(uts_table));
 | |
| 	uts_table.data = tmp_data;
 | |
| 
 | |
| 	/*
 | |
| 	 * Buffer the value in tmp_data so that proc_dostring() can be called
 | |
| 	 * without holding any locks.
 | |
| 	 * We also need to read the original value in the write==1 case to
 | |
| 	 * support partial writes.
 | |
| 	 */
 | |
| 	down_read(&uts_sem);
 | |
| 	memcpy(tmp_data, get_uts(table), sizeof(tmp_data));
 | |
| 	up_read(&uts_sem);
 | |
| 	r = proc_dostring(&uts_table, write, buffer, lenp, ppos);
 | |
| 
 | |
| 	if (write) {
 | |
| 		/*
 | |
| 		 * Write back the new value.
 | |
| 		 * Note that, since we dropped uts_sem, the result can
 | |
| 		 * theoretically be incorrect if there are two parallel writes
 | |
| 		 * at non-zero offsets to the same sysctl.
 | |
| 		 */
 | |
| 		add_device_randomness(tmp_data, sizeof(tmp_data));
 | |
| 		down_write(&uts_sem);
 | |
| 		memcpy(get_uts(table), tmp_data, sizeof(tmp_data));
 | |
| 		up_write(&uts_sem);
 | |
| 		proc_sys_poll_notify(table->poll);
 | |
| 	}
 | |
| 
 | |
| 	return r;
 | |
| }
 | |
| #else
 | |
| #define proc_do_uts_string NULL
 | |
| #endif
 | |
| 
 | |
| static DEFINE_CTL_TABLE_POLL(hostname_poll);
 | |
| static DEFINE_CTL_TABLE_POLL(domainname_poll);
 | |
| 
 | |
| // Note: update 'enum uts_proc' to match any changes to this table
 | |
| static const struct ctl_table uts_kern_table[] = {
 | |
| 	{
 | |
| 		.procname	= "arch",
 | |
| 		.data		= init_uts_ns.name.machine,
 | |
| 		.maxlen		= sizeof(init_uts_ns.name.machine),
 | |
| 		.mode		= 0444,
 | |
| 		.proc_handler	= proc_do_uts_string,
 | |
| 	},
 | |
| 	{
 | |
| 		.procname	= "ostype",
 | |
| 		.data		= init_uts_ns.name.sysname,
 | |
| 		.maxlen		= sizeof(init_uts_ns.name.sysname),
 | |
| 		.mode		= 0444,
 | |
| 		.proc_handler	= proc_do_uts_string,
 | |
| 	},
 | |
| 	{
 | |
| 		.procname	= "osrelease",
 | |
| 		.data		= init_uts_ns.name.release,
 | |
| 		.maxlen		= sizeof(init_uts_ns.name.release),
 | |
| 		.mode		= 0444,
 | |
| 		.proc_handler	= proc_do_uts_string,
 | |
| 	},
 | |
| 	{
 | |
| 		.procname	= "version",
 | |
| 		.data		= init_uts_ns.name.version,
 | |
| 		.maxlen		= sizeof(init_uts_ns.name.version),
 | |
| 		.mode		= 0444,
 | |
| 		.proc_handler	= proc_do_uts_string,
 | |
| 	},
 | |
| 	{
 | |
| 		.procname	= "hostname",
 | |
| 		.data		= init_uts_ns.name.nodename,
 | |
| 		.maxlen		= sizeof(init_uts_ns.name.nodename),
 | |
| 		.mode		= 0644,
 | |
| 		.proc_handler	= proc_do_uts_string,
 | |
| 		.poll		= &hostname_poll,
 | |
| 	},
 | |
| 	{
 | |
| 		.procname	= "domainname",
 | |
| 		.data		= init_uts_ns.name.domainname,
 | |
| 		.maxlen		= sizeof(init_uts_ns.name.domainname),
 | |
| 		.mode		= 0644,
 | |
| 		.proc_handler	= proc_do_uts_string,
 | |
| 		.poll		= &domainname_poll,
 | |
| 	},
 | |
| };
 | |
| 
 | |
| #ifdef CONFIG_PROC_SYSCTL
 | |
| /*
 | |
|  * Notify userspace about a change in a certain entry of uts_kern_table,
 | |
|  * identified by the parameter proc.
 | |
|  */
 | |
| void uts_proc_notify(enum uts_proc proc)
 | |
| {
 | |
| 	const struct ctl_table *table = &uts_kern_table[proc];
 | |
| 
 | |
| 	proc_sys_poll_notify(table->poll);
 | |
| }
 | |
| #endif
 | |
| 
 | |
| static int __init utsname_sysctl_init(void)
 | |
| {
 | |
| 	register_sysctl("kernel", uts_kern_table);
 | |
| 	return 0;
 | |
| }
 | |
| 
 | |
| device_initcall(utsname_sysctl_init);
 |