mirror of
https://github.com/AtlasLinux/linux.git
synced 2026-02-02 15:22:09 -08:00
sysctl: treewide: constify the ctl_table argument of proc_handlers
const qualify the struct ctl_table argument in the proc_handler function
signatures. This is a prerequisite to moving the static ctl_table
structs into .rodata data which will ensure that proc_handler function
pointers cannot be modified.
This patch has been generated by the following coccinelle script:
```
virtual patch
@r1@
identifier ctl, write, buffer, lenp, ppos;
identifier func !~ "appldata_(timer|interval)_handler|sched_(rt|rr)_handler|rds_tcp_skbuf_handler|proc_sctp_do_(hmac_alg|rto_min|rto_max|udp_port|alpha_beta|auth|probe_interval)";
@@
int func(
- struct ctl_table *ctl
+ const struct ctl_table *ctl
,int write, void *buffer, size_t *lenp, loff_t *ppos);
@r2@
identifier func, ctl, write, buffer, lenp, ppos;
@@
int func(
- struct ctl_table *ctl
+ const struct ctl_table *ctl
,int write, void *buffer, size_t *lenp, loff_t *ppos)
{ ... }
@r3@
identifier func;
@@
int func(
- struct ctl_table *
+ const struct ctl_table *
,int , void *, size_t *, loff_t *);
@r4@
identifier func, ctl;
@@
int func(
- struct ctl_table *ctl
+ const struct ctl_table *ctl
,int , void *, size_t *, loff_t *);
@r5@
identifier func, write, buffer, lenp, ppos;
@@
int func(
- struct ctl_table *
+ const struct ctl_table *
,int write, void *buffer, size_t *lenp, loff_t *ppos);
```
* Code formatting was adjusted in xfs_sysctl.c to comply with code
conventions. The xfs_stats_clear_proc_handler,
xfs_panic_mask_proc_handler and xfs_deprecated_dointvec_minmax where
adjusted.
* The ctl_table argument in proc_watchdog_common was const qualified.
This is called from a proc_handler itself and is calling back into
another proc_handler, making it necessary to change it as part of the
proc_handler migration.
Co-developed-by: Thomas Weißschuh <linux@weissschuh.net>
Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
Co-developed-by: Joel Granados <j.granados@samsung.com>
Signed-off-by: Joel Granados <j.granados@samsung.com>
This commit is contained in:
@@ -507,7 +507,7 @@ static int update_insn_emulation_mode(struct insn_emulation *insn,
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int emulation_proc_handler(struct ctl_table *table, int write,
|
||||
static int emulation_proc_handler(const struct ctl_table *table, int write,
|
||||
void *buffer, size_t *lenp,
|
||||
loff_t *ppos)
|
||||
{
|
||||
|
||||
@@ -535,7 +535,7 @@ static unsigned int find_supported_vector_length(enum vec_type type,
|
||||
|
||||
#if defined(CONFIG_ARM64_SVE) && defined(CONFIG_SYSCTL)
|
||||
|
||||
static int vec_proc_do_default_vl(struct ctl_table *table, int write,
|
||||
static int vec_proc_do_default_vl(const struct ctl_table *table, int write,
|
||||
void *buffer, size_t *lenp, loff_t *ppos)
|
||||
{
|
||||
struct vl_info *info = table->extra1;
|
||||
|
||||
@@ -46,9 +46,9 @@
|
||||
* /proc entries (sysctl)
|
||||
*/
|
||||
static const char appldata_proc_name[APPLDATA_PROC_NAME_LENGTH] = "appldata";
|
||||
static int appldata_timer_handler(struct ctl_table *ctl, int write,
|
||||
static int appldata_timer_handler(const struct ctl_table *ctl, int write,
|
||||
void *buffer, size_t *lenp, loff_t *ppos);
|
||||
static int appldata_interval_handler(struct ctl_table *ctl, int write,
|
||||
static int appldata_interval_handler(const struct ctl_table *ctl, int write,
|
||||
void *buffer, size_t *lenp, loff_t *ppos);
|
||||
|
||||
static struct ctl_table_header *appldata_sysctl_header;
|
||||
@@ -199,7 +199,7 @@ static void __appldata_vtimer_setup(int cmd)
|
||||
* Start/Stop timer, show status of timer (0 = not active, 1 = active)
|
||||
*/
|
||||
static int
|
||||
appldata_timer_handler(struct ctl_table *ctl, int write,
|
||||
appldata_timer_handler(const struct ctl_table *ctl, int write,
|
||||
void *buffer, size_t *lenp, loff_t *ppos)
|
||||
{
|
||||
int timer_active = appldata_timer_active;
|
||||
@@ -232,7 +232,7 @@ appldata_timer_handler(struct ctl_table *ctl, int write,
|
||||
* current timer interval.
|
||||
*/
|
||||
static int
|
||||
appldata_interval_handler(struct ctl_table *ctl, int write,
|
||||
appldata_interval_handler(const struct ctl_table *ctl, int write,
|
||||
void *buffer, size_t *lenp, loff_t *ppos)
|
||||
{
|
||||
int interval = appldata_interval;
|
||||
@@ -262,7 +262,7 @@ appldata_interval_handler(struct ctl_table *ctl, int write,
|
||||
* monitoring (0 = not in process, 1 = in process)
|
||||
*/
|
||||
static int
|
||||
appldata_generic_handler(struct ctl_table *ctl, int write,
|
||||
appldata_generic_handler(const struct ctl_table *ctl, int write,
|
||||
void *buffer, size_t *lenp, loff_t *ppos)
|
||||
{
|
||||
struct appldata_ops *ops = NULL, *tmp_ops;
|
||||
|
||||
@@ -954,7 +954,7 @@ static int debug_active = 1;
|
||||
* always allow read, allow write only if debug_stoppable is set or
|
||||
* if debug_active is already off
|
||||
*/
|
||||
static int s390dbf_procactive(struct ctl_table *table, int write,
|
||||
static int s390dbf_procactive(const struct ctl_table *table, int write,
|
||||
void *buffer, size_t *lenp, loff_t *ppos)
|
||||
{
|
||||
if (!write || debug_stoppable || !debug_active)
|
||||
|
||||
@@ -594,7 +594,7 @@ static int __init topology_setup(char *str)
|
||||
}
|
||||
early_param("topology", topology_setup);
|
||||
|
||||
static int topology_ctl_handler(struct ctl_table *ctl, int write,
|
||||
static int topology_ctl_handler(const struct ctl_table *ctl, int write,
|
||||
void *buffer, size_t *lenp, loff_t *ppos)
|
||||
{
|
||||
int enabled = topology_is_enabled();
|
||||
|
||||
@@ -243,7 +243,7 @@ static int cmm_skip_blanks(char *cp, char **endp)
|
||||
return str != cp;
|
||||
}
|
||||
|
||||
static int cmm_pages_handler(struct ctl_table *ctl, int write,
|
||||
static int cmm_pages_handler(const struct ctl_table *ctl, int write,
|
||||
void *buffer, size_t *lenp, loff_t *ppos)
|
||||
{
|
||||
long nr = cmm_get_pages();
|
||||
@@ -262,7 +262,7 @@ static int cmm_pages_handler(struct ctl_table *ctl, int write,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int cmm_timed_pages_handler(struct ctl_table *ctl, int write,
|
||||
static int cmm_timed_pages_handler(const struct ctl_table *ctl, int write,
|
||||
void *buffer, size_t *lenp,
|
||||
loff_t *ppos)
|
||||
{
|
||||
@@ -282,7 +282,7 @@ static int cmm_timed_pages_handler(struct ctl_table *ctl, int write,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int cmm_timeout_handler(struct ctl_table *ctl, int write,
|
||||
static int cmm_timeout_handler(const struct ctl_table *ctl, int write,
|
||||
void *buffer, size_t *lenp, loff_t *ppos)
|
||||
{
|
||||
char buf[64], *p;
|
||||
|
||||
@@ -38,7 +38,7 @@ static bool __read_mostly sched_itmt_capable;
|
||||
*/
|
||||
unsigned int __read_mostly sysctl_sched_itmt_enabled;
|
||||
|
||||
static int sched_itmt_update_handler(struct ctl_table *table, int write,
|
||||
static int sched_itmt_update_handler(const struct ctl_table *table, int write,
|
||||
void *buffer, size_t *lenp, loff_t *ppos)
|
||||
{
|
||||
unsigned int old_sysctl;
|
||||
|
||||
@@ -3473,7 +3473,7 @@ static int cdrom_print_info(const char *header, int val, char *info,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int cdrom_sysctl_info(struct ctl_table *ctl, int write,
|
||||
static int cdrom_sysctl_info(const struct ctl_table *ctl, int write,
|
||||
void *buffer, size_t *lenp, loff_t *ppos)
|
||||
{
|
||||
int pos;
|
||||
@@ -3586,7 +3586,7 @@ static void cdrom_update_settings(void)
|
||||
mutex_unlock(&cdrom_mutex);
|
||||
}
|
||||
|
||||
static int cdrom_sysctl_handler(struct ctl_table *ctl, int write,
|
||||
static int cdrom_sysctl_handler(const struct ctl_table *ctl, int write,
|
||||
void *buffer, size_t *lenp, loff_t *ppos)
|
||||
{
|
||||
int ret;
|
||||
|
||||
@@ -1620,7 +1620,7 @@ static u8 sysctl_bootid[UUID_SIZE];
|
||||
* UUID. The difference is in whether table->data is NULL; if it is,
|
||||
* then a new UUID is generated and returned to the user.
|
||||
*/
|
||||
static int proc_do_uuid(struct ctl_table *table, int write, void *buf,
|
||||
static int proc_do_uuid(const struct ctl_table *table, int write, void *buf,
|
||||
size_t *lenp, loff_t *ppos)
|
||||
{
|
||||
u8 tmp_uuid[UUID_SIZE], *uuid;
|
||||
@@ -1651,7 +1651,7 @@ static int proc_do_uuid(struct ctl_table *table, int write, void *buf,
|
||||
}
|
||||
|
||||
/* The same as proc_dointvec, but writes don't change anything. */
|
||||
static int proc_do_rointvec(struct ctl_table *table, int write, void *buf,
|
||||
static int proc_do_rointvec(const struct ctl_table *table, int write, void *buf,
|
||||
size_t *lenp, loff_t *ppos)
|
||||
{
|
||||
return write ? 0 : proc_dointvec(table, 0, buf, lenp, ppos);
|
||||
|
||||
@@ -183,7 +183,7 @@ static void mac_hid_stop_emulation(void)
|
||||
mac_hid_destroy_emumouse();
|
||||
}
|
||||
|
||||
static int mac_hid_toggle_emumouse(struct ctl_table *table, int write,
|
||||
static int mac_hid_toggle_emumouse(const struct ctl_table *table, int write,
|
||||
void *buffer, size_t *lenp, loff_t *ppos)
|
||||
{
|
||||
int *valp = table->data;
|
||||
|
||||
@@ -1886,7 +1886,7 @@ unlock:
|
||||
return res;
|
||||
}
|
||||
|
||||
static int vrf_shared_table_handler(struct ctl_table *table, int write,
|
||||
static int vrf_shared_table_handler(const struct ctl_table *table, int write,
|
||||
void *buffer, size_t *lenp, loff_t *ppos)
|
||||
{
|
||||
struct net *net = (struct net *)table->extra1;
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
#define PARPORT_MIN_SPINTIME_VALUE 1
|
||||
#define PARPORT_MAX_SPINTIME_VALUE 1000
|
||||
|
||||
static int do_active_device(struct ctl_table *table, int write,
|
||||
static int do_active_device(const struct ctl_table *table, int write,
|
||||
void *result, size_t *lenp, loff_t *ppos)
|
||||
{
|
||||
struct parport *port = (struct parport *)table->extra1;
|
||||
@@ -70,7 +70,7 @@ static int do_active_device(struct ctl_table *table, int write,
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PARPORT_1284
|
||||
static int do_autoprobe(struct ctl_table *table, int write,
|
||||
static int do_autoprobe(const struct ctl_table *table, int write,
|
||||
void *result, size_t *lenp, loff_t *ppos)
|
||||
{
|
||||
struct parport_device_info *info = table->extra2;
|
||||
@@ -113,7 +113,7 @@ static int do_autoprobe(struct ctl_table *table, int write,
|
||||
}
|
||||
#endif /* IEEE1284.3 support. */
|
||||
|
||||
static int do_hardware_base_addr(struct ctl_table *table, int write,
|
||||
static int do_hardware_base_addr(const struct ctl_table *table, int write,
|
||||
void *result, size_t *lenp, loff_t *ppos)
|
||||
{
|
||||
struct parport *port = (struct parport *)table->extra1;
|
||||
@@ -140,7 +140,7 @@ static int do_hardware_base_addr(struct ctl_table *table, int write,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int do_hardware_irq(struct ctl_table *table, int write,
|
||||
static int do_hardware_irq(const struct ctl_table *table, int write,
|
||||
void *result, size_t *lenp, loff_t *ppos)
|
||||
{
|
||||
struct parport *port = (struct parport *)table->extra1;
|
||||
@@ -167,7 +167,7 @@ static int do_hardware_irq(struct ctl_table *table, int write,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int do_hardware_dma(struct ctl_table *table, int write,
|
||||
static int do_hardware_dma(const struct ctl_table *table, int write,
|
||||
void *result, size_t *lenp, loff_t *ppos)
|
||||
{
|
||||
struct parport *port = (struct parport *)table->extra1;
|
||||
@@ -194,7 +194,7 @@ static int do_hardware_dma(struct ctl_table *table, int write,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int do_hardware_modes(struct ctl_table *table, int write,
|
||||
static int do_hardware_modes(const struct ctl_table *table, int write,
|
||||
void *result, size_t *lenp, loff_t *ppos)
|
||||
{
|
||||
struct parport *port = (struct parport *)table->extra1;
|
||||
|
||||
@@ -1257,7 +1257,7 @@ static void armv8pmu_disable_user_access_ipi(void *unused)
|
||||
armv8pmu_disable_user_access();
|
||||
}
|
||||
|
||||
static int armv8pmu_proc_user_access_handler(struct ctl_table *table, int write,
|
||||
static int armv8pmu_proc_user_access_handler(const struct ctl_table *table, int write,
|
||||
void *buffer, size_t *lenp, loff_t *ppos)
|
||||
{
|
||||
int ret = proc_dointvec_minmax(table, write, buffer, lenp, ppos);
|
||||
|
||||
@@ -1277,7 +1277,7 @@ static void riscv_pmu_update_counter_access(void *info)
|
||||
csr_write(CSR_SCOUNTEREN, 0x2);
|
||||
}
|
||||
|
||||
static int riscv_pmu_proc_user_access_handler(struct ctl_table *table,
|
||||
static int riscv_pmu_proc_user_access_handler(const struct ctl_table *table,
|
||||
int write, void *buffer,
|
||||
size_t *lenp, loff_t *ppos)
|
||||
{
|
||||
|
||||
@@ -991,7 +991,7 @@ void validate_coredump_safety(void)
|
||||
}
|
||||
}
|
||||
|
||||
static int proc_dostring_coredump(struct ctl_table *table, int write,
|
||||
static int proc_dostring_coredump(const struct ctl_table *table, int write,
|
||||
void *buffer, size_t *lenp, loff_t *ppos)
|
||||
{
|
||||
int error = proc_dostring(table, write, buffer, lenp, ppos);
|
||||
|
||||
@@ -177,7 +177,7 @@ static long get_nr_dentry_negative(void)
|
||||
return sum < 0 ? 0 : sum;
|
||||
}
|
||||
|
||||
static int proc_nr_dentry(struct ctl_table *table, int write, void *buffer,
|
||||
static int proc_nr_dentry(const struct ctl_table *table, int write, void *buffer,
|
||||
size_t *lenp, loff_t *ppos)
|
||||
{
|
||||
dentry_stat.nr_dentry = get_nr_dentry();
|
||||
|
||||
@@ -48,7 +48,7 @@ static void drop_pagecache_sb(struct super_block *sb, void *unused)
|
||||
iput(toput_inode);
|
||||
}
|
||||
|
||||
int drop_caches_sysctl_handler(struct ctl_table *table, int write,
|
||||
int drop_caches_sysctl_handler(const struct ctl_table *table, int write,
|
||||
void *buffer, size_t *length, loff_t *ppos)
|
||||
{
|
||||
int ret;
|
||||
|
||||
@@ -2204,7 +2204,7 @@ COMPAT_SYSCALL_DEFINE5(execveat, int, fd,
|
||||
|
||||
#ifdef CONFIG_SYSCTL
|
||||
|
||||
static int proc_dointvec_minmax_coredump(struct ctl_table *table, int write,
|
||||
static int proc_dointvec_minmax_coredump(const struct ctl_table *table, int write,
|
||||
void *buffer, size_t *lenp, loff_t *ppos)
|
||||
{
|
||||
int error = proc_dointvec_minmax(table, write, buffer, lenp, ppos);
|
||||
|
||||
@@ -96,7 +96,7 @@ EXPORT_SYMBOL_GPL(get_max_files);
|
||||
/*
|
||||
* Handle nr_files sysctl
|
||||
*/
|
||||
static int proc_nr_files(struct ctl_table *table, int write, void *buffer,
|
||||
static int proc_nr_files(const struct ctl_table *table, int write, void *buffer,
|
||||
size_t *lenp, loff_t *ppos)
|
||||
{
|
||||
files_stat.nr_files = get_nr_files();
|
||||
|
||||
@@ -2413,7 +2413,7 @@ static int __init start_dirtytime_writeback(void)
|
||||
}
|
||||
__initcall(start_dirtytime_writeback);
|
||||
|
||||
int dirtytime_interval_handler(struct ctl_table *table, int write,
|
||||
int dirtytime_interval_handler(const struct ctl_table *table, int write,
|
||||
void *buffer, size_t *lenp, loff_t *ppos)
|
||||
{
|
||||
int ret;
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user