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.
Showing the changes to kernel/bpf (1 of 93 files). Show all
Unified · Split
| @@ -5983,7 +5983,7 @@ const struct bpf_prog_ops bpf_syscall_prog_ops = { · 5982 unmodified lines | |||
| 5983 | }; | 5983 | }; |
| 5984 | 5984 | ||
| 5985 | #ifdef CONFIG_SYSCTL | 5985 | #ifdef CONFIG_SYSCTL |
| 5986 | static int bpf_stats_handler(struct ctl_table *table, int write, | 5986 | static int bpf_stats_handler(const struct ctl_table *table, int write, |
| 5987 | void *buffer, size_t *lenp, loff_t *ppos) | 5987 | void *buffer, size_t *lenp, loff_t *ppos) |
| 5988 | { | 5988 | { |
| 5989 | struct static_key *key = (struct static_key *)table->data; | 5989 | struct static_key *key = (struct static_key *)table->data; |
| @@ -6018,7 +6018,7 @@ void __weak unpriv_ebpf_notify(int new_state) · 28 unmodified lines | |||
| 6018 | { | 6018 | { |
| 6019 | } | 6019 | } |
| 6020 | 6020 | ||
| 6021 | static int bpf_unpriv_handler(struct ctl_table *table, int write, | 6021 | static int bpf_unpriv_handler(const struct ctl_table *table, int write, |
| 6022 | void *buffer, size_t *lenp, loff_t *ppos) | 6022 | void *buffer, size_t *lenp, loff_t *ppos) |
| 6023 | { | 6023 | { |
| 6024 | int ret, unpriv_enable = *(int *)table->data; | 6024 | int ret, unpriv_enable = *(int *)table->data; |