Skip to content

Commit 980f8f8

Browse files
committed
Merge tag 'sysctl-6.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl
Pull sysctl updates from Joel Granados: "sysctl ctl_table constification: - Constifying ctl_table structs prevents the modification of proc_handler function pointers. All ctl_table struct arguments are const qualified in the sysctl API in such a way that the ctl_table arrays being defined elsewhere and passed through sysctl can be constified one-by-one. We kick the constification off by qualifying user_table in kernel/ucount.c and expect all the ctl_tables to be constified in the coming releases. Misc fixes: - Adjust comments in two places to better reflect the code - Remove superfluous dput calls - Remove Luis from sysctl maintainership - Replace comments about holding a lock with calls to lockdep_assert_held" * tag 'sysctl-6.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl: sysctl: Reduce dput(child) calls in proc_sys_fill_cache() sysctl: Reorganize kerneldoc parameter names ucounts: constify sysctl table user_table sysctl: update comments to new registration APIs MAINTAINERS: remove me from sysctl sysctl: Convert locking comments to lockdep assertions const_structs.checkpatch: add ctl_table sysctl: make internal ctl_tables const sysctl: allow registration of const struct ctl_table sysctl: move internal interfaces to const struct ctl_table bpf: Constify ctl_table argument of filter function
2 parents 2a163a4 + 9c738da commit 980f8f8

File tree

9 files changed

+73
-69
lines changed

9 files changed

+73
-69
lines changed

MAINTAINERS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18641,7 +18641,6 @@ F: include/linux/proc_fs.h
1864118641
F: tools/testing/selftests/proc/
1864218642

1864318643
PROC SYSCTL
18644-
M: Luis Chamberlain <[email protected]>
1864518644
M: Kees Cook <[email protected]>
1864618645
M: Joel Granados <[email protected]>
1864718646

fs/proc/internal.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ struct proc_inode {
102102
union proc_op op;
103103
struct proc_dir_entry *pde;
104104
struct ctl_table_header *sysctl;
105-
struct ctl_table *sysctl_entry;
105+
const struct ctl_table *sysctl_entry;
106106
struct hlist_node sibling_inodes;
107107
const struct proc_ns_operations *ns_ops;
108108
struct inode vfs_inode;

0 commit comments

Comments
 (0)