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 include/net (3 of 93 files). Show all
Unified · Split
| @@ -486,7 +486,7 @@ void igmp6_event_report(struct sk_buff *skb); · 485 unmodified lines | |||
| 486 | 486 | ||
| 487 | 487 | ||
| 488 | #ifdef CONFIG_SYSCTL | 488 | #ifdef CONFIG_SYSCTL |
| 489 | int ndisc_ifinfo_sysctl_change(struct ctl_table *ctl, int write, | 489 | int ndisc_ifinfo_sysctl_change(const struct ctl_table *ctl, int write, |
| 490 | void *buffer, size_t *lenp, loff_t *ppos); | 490 | void *buffer, size_t *lenp, loff_t *ppos); |
| 491 | #endif | 491 | #endif |
| 492 | 492 | ||
| @@ -412,12 +412,12 @@ void *neigh_seq_start(struct seq_file *, loff_t *, struct neigh_table *, · 411 unmodified lines | |||
| 412 | void *neigh_seq_next(struct seq_file *, void *, loff_t *); | 412 | void *neigh_seq_next(struct seq_file *, void *, loff_t *); |
| 413 | void neigh_seq_stop(struct seq_file *, void *); | 413 | void neigh_seq_stop(struct seq_file *, void *); |
| 414 | 414 | ||
| 415 | int neigh_proc_dointvec(struct ctl_table *ctl, int write, | 415 | int neigh_proc_dointvec(const struct ctl_table *ctl, int write, |
| 416 | void *buffer, size_t *lenp, loff_t *ppos); | 416 | void *buffer, size_t *lenp, loff_t *ppos); |
| 417 | int neigh_proc_dointvec_jiffies(struct ctl_table *ctl, int write, | 417 | int neigh_proc_dointvec_jiffies(const struct ctl_table *ctl, int write, |
| 418 | void *buffer, | 418 | void *buffer, |
| 419 | size_t *lenp, loff_t *ppos); | 419 | size_t *lenp, loff_t *ppos); |
| 420 | int neigh_proc_dointvec_ms_jiffies(struct ctl_table *ctl, int write, | 420 | int neigh_proc_dointvec_ms_jiffies(const struct ctl_table *ctl, int write, |
| 421 | void *buffer, size_t *lenp, loff_t *ppos); | 421 | void *buffer, size_t *lenp, loff_t *ppos); |
| 422 | 422 | ||
| 423 | int neigh_sysctl_register(struct net_device *dev, struct neigh_parms *p, | 423 | int neigh_sysctl_register(struct net_device *dev, struct neigh_parms *p, |
| @@ -2,6 +2,6 @@ · 1 unmodified line | |||
| 2 | #include <linux/types.h> | 2 | #include <linux/types.h> |
| 3 | 3 | ||
| 4 | #ifdef CONFIG_SYSCTL | 4 | #ifdef CONFIG_SYSCTL |
| 5 | int nf_hooks_lwtunnel_sysctl_handler(struct ctl_table *table, int write, | 5 | int nf_hooks_lwtunnel_sysctl_handler(const struct ctl_table *table, int write, |
| 6 | void *buffer, size_t *lenp, loff_t *ppos); | 6 | void *buffer, size_t *lenp, loff_t *ppos); |
| 7 | #endif | 7 | #endif |