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.

Joel Granados committed 2 years ago

Commit 78eb4ea1 parent 7a3fad393 files · +258 −258Browse files

Showing the changes to kernel/trace (4 of 93 files). Show all

Unified · Split

4 files

kernel/trace/ftrace.c +1 −1
kernel/trace/trace.c +1 −1
kernel/trace/trace_events_user.c +1 −1
kernel/trace/trace_stack.c +1 −1

kernel/trace/ftrace.c+1−1

@@ -8735,7 +8735,7 @@ static bool is_permanent_ops_registered(void) · 8734 unmodified lines
8735	}	8735	}
8736		8736
8737	static int	8737	static int
8738	ftrace_enable_sysctl(struct ctl_table *table, int write,	8738	ftrace_enable_sysctl(const struct ctl_table *table, int write,
8739	void buffer, size_t lenp, loff_t *ppos)	8739	void buffer, size_t lenp, loff_t *ppos)
8740	{	8740	{
8741	int ret = -ENODEV;	8741	int ret = -ENODEV;

kernel/trace/trace.c+1−1

@@ -2767,7 +2767,7 @@ static void output_printk(struct trace_event_buffer *fbuffer) · 2766 unmodified lines
2767	raw_spin_unlock_irqrestore(&tracepoint_iter_lock, flags);	2767	raw_spin_unlock_irqrestore(&tracepoint_iter_lock, flags);
2768	}	2768	}
2769		2769
2770	int tracepoint_printk_sysctl(struct ctl_table *table, int write,	2770	int tracepoint_printk_sysctl(const struct ctl_table *table, int write,
2771	void buffer, size_t lenp,	2771	void buffer, size_t lenp,
2772	loff_t *ppos)	2772	loff_t *ppos)
2773	{	2773	{

kernel/trace/trace_events_user.c+1−1

@@ -2885,7 +2885,7 @@ err: · 2884 unmodified lines
2885	return -ENODEV;	2885	return -ENODEV;
2886	}	2886	}
2887		2887
2888	static int set_max_user_events_sysctl(struct ctl_table *table, int write,	2888	static int set_max_user_events_sysctl(const struct ctl_table *table, int write,
2889	void buffer, size_t lenp, loff_t *ppos)	2889	void buffer, size_t lenp, loff_t *ppos)
2890	{	2890	{
2891	int ret;	2891	int ret;

kernel/trace/trace_stack.c+1−1

@@ -514,7 +514,7 @@ static const struct file_operations stack_trace_filter_fops = { · 513 unmodified lines
514	#endif /* CONFIG_DYNAMIC_FTRACE */	514	#endif /* CONFIG_DYNAMIC_FTRACE */
515		515
516	int	516	int
517	stack_trace_sysctl(struct ctl_table table, int write, void buffer,	517	stack_trace_sysctl(const struct ctl_table table, int write, void buffer,
518	size_t lenp, loff_t ppos)	518	size_t lenp, loff_t ppos)
519	{	519	{
520	int was_enabled;	520	int was_enabled;

sysctl: treewide: constify the ctl_table argument of proc_handlers

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code