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>
		
	
			
		
			
				
	
	
		
			36 lines
		
	
	
	
		
			851 B
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			36 lines
		
	
	
	
		
			851 B
		
	
	
	
		
			C
		
	
	
	
	
	
| // SPDX-License-Identifier: GPL-2.0-or-later
 | |
| /* Error injection handling.
 | |
|  *
 | |
|  * Copyright (C) 2021 Red Hat, Inc. All Rights Reserved.
 | |
|  * Written by David Howells (dhowells@redhat.com)
 | |
|  */
 | |
| 
 | |
| #include <linux/sysctl.h>
 | |
| #include "internal.h"
 | |
| 
 | |
| unsigned int cachefiles_error_injection_state;
 | |
| 
 | |
| static struct ctl_table_header *cachefiles_sysctl;
 | |
| static const struct ctl_table cachefiles_sysctls[] = {
 | |
| 	{
 | |
| 		.procname	= "error_injection",
 | |
| 		.data		= &cachefiles_error_injection_state,
 | |
| 		.maxlen		= sizeof(unsigned int),
 | |
| 		.mode		= 0644,
 | |
| 		.proc_handler	= proc_douintvec,
 | |
| 	},
 | |
| };
 | |
| 
 | |
| int __init cachefiles_register_error_injection(void)
 | |
| {
 | |
| 	cachefiles_sysctl = register_sysctl("cachefiles", cachefiles_sysctls);
 | |
| 	if (!cachefiles_sysctl)
 | |
| 		return -ENOMEM;
 | |
| 	return 0;
 | |
| 
 | |
| }
 | |
| 
 | |
| void cachefiles_unregister_error_injection(void)
 | |
| {
 | |
| 	unregister_sysctl_table(cachefiles_sysctl);
 | |
| }
 |