| Message ID | 20240315-sysctl-const-ownership-v3-1-b86680eae02e@weissschuh.net (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | sysctl: treewide: prepare ctl_table_root for ctl_table constification | expand |
On Fri, Mar 15, 2024 at 07:11:30PM +0100, Thomas Weißschuh wrote: > The argument is never used and can be removed. > > In a future commit the sysctl core will only use > "const struct ctl_table". Removing it here is a preparation for this > consitifcation. > > The patch was created with the following coccinelle script: > > @@ > identifier func, head, table, uid, gid; > @@ > > void func( > struct ctl_table_header *head, > - struct ctl_table *table, > kuid_t *uid, kgid_t *gid) > { ... } > > The single changed location was validate through manual inspection and > compilation. Will drop this from the commit message when I add it to constfy branch. For the same reasons as before. here is the commit message that I'll use """ sysctl: treewide: drop unused argument ctl_table_root::set_ownership(table) Remove the 'table' argument from set_ownership as it is never used. This change is a step towards putting "struct ctl_table" into .rodata and eventually having sysctl core only use "const struct ctl_table". The patch was created with the following coccinelle script: @@ identifier func, head, table, uid, gid; @@ void func( struct ctl_table_header *head, - struct ctl_table *table, kuid_t *uid, kgid_t *gid) { ... } No additional occurrences of 'set_ownership' were found after doing a tree-wide search. """ Reviewed-by: Joel Granados <j.granados@samsung.com> thx. > > In addition, a search for 'set_ownership' was done over the full tree to > look for places that were missed by coccinelle. > None were found. > > Signed-off-by: Thomas Weißschuh <linux@weissschuh.net> > --- > fs/proc/proc_sysctl.c | 2 +- > include/linux/sysctl.h | 1 - > ipc/ipc_sysctl.c | 3 +-- > ipc/mq_sysctl.c | 3 +-- > net/sysctl_net.c | 1 - > 5 files changed, 3 insertions(+), 7 deletions(-) > > diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c > index 37cde0efee57..ed3a41ed9705 100644 > --- a/fs/proc/proc_sysctl.c > +++ b/fs/proc/proc_sysctl.c > @@ -480,7 +480,7 @@ static struct inode *proc_sys_make_inode(struct super_block *sb, > } > > if (root->set_ownership) > - root->set_ownership(head, table, &inode->i_uid, &inode->i_gid); > + root->set_ownership(head, &inode->i_uid, &inode->i_gid); > else { > inode->i_uid = GLOBAL_ROOT_UID; > inode->i_gid = GLOBAL_ROOT_GID; > diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h > index ee7d33b89e9e..60333a6b9370 100644 > --- a/include/linux/sysctl.h > +++ b/include/linux/sysctl.h > @@ -205,7 +205,6 @@ struct ctl_table_root { > struct ctl_table_set default_set; > struct ctl_table_set *(*lookup)(struct ctl_table_root *root); > void (*set_ownership)(struct ctl_table_header *head, > - struct ctl_table *table, > kuid_t *uid, kgid_t *gid); > int (*permissions)(struct ctl_table_header *head, struct ctl_table *table); > }; > diff --git a/ipc/ipc_sysctl.c b/ipc/ipc_sysctl.c > index 45cb1dabce29..1a5085e5b178 100644 > --- a/ipc/ipc_sysctl.c > +++ b/ipc/ipc_sysctl.c > @@ -192,7 +192,6 @@ static int set_is_seen(struct ctl_table_set *set) > } > > static void ipc_set_ownership(struct ctl_table_header *head, > - struct ctl_table *table, > kuid_t *uid, kgid_t *gid) > { > struct ipc_namespace *ns = > @@ -224,7 +223,7 @@ static int ipc_permissions(struct ctl_table_header *head, struct ctl_table *tabl > kuid_t ns_root_uid; > kgid_t ns_root_gid; > > - ipc_set_ownership(head, table, &ns_root_uid, &ns_root_gid); > + ipc_set_ownership(head, &ns_root_uid, &ns_root_gid); > > if (uid_eq(current_euid(), ns_root_uid)) > mode >>= 6; > diff --git a/ipc/mq_sysctl.c b/ipc/mq_sysctl.c > index 21fba3a6edaf..6bb1c5397c69 100644 > --- a/ipc/mq_sysctl.c > +++ b/ipc/mq_sysctl.c > @@ -78,7 +78,6 @@ static int set_is_seen(struct ctl_table_set *set) > } > > static void mq_set_ownership(struct ctl_table_header *head, > - struct ctl_table *table, > kuid_t *uid, kgid_t *gid) > { > struct ipc_namespace *ns = > @@ -97,7 +96,7 @@ static int mq_permissions(struct ctl_table_header *head, struct ctl_table *table > kuid_t ns_root_uid; > kgid_t ns_root_gid; > > - mq_set_ownership(head, table, &ns_root_uid, &ns_root_gid); > + mq_set_ownership(head, &ns_root_uid, &ns_root_gid); > > if (uid_eq(current_euid(), ns_root_uid)) > mode >>= 6; > diff --git a/net/sysctl_net.c b/net/sysctl_net.c > index 051ed5f6fc93..a0a7a79991f9 100644 > --- a/net/sysctl_net.c > +++ b/net/sysctl_net.c > @@ -54,7 +54,6 @@ static int net_ctl_permissions(struct ctl_table_header *head, > } > > static void net_ctl_set_ownership(struct ctl_table_header *head, > - struct ctl_table *table, > kuid_t *uid, kgid_t *gid) > { > struct net *net = container_of(head->set, struct net, sysctls); > > -- > 2.44.0 >
diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c index 37cde0efee57..ed3a41ed9705 100644 --- a/fs/proc/proc_sysctl.c +++ b/fs/proc/proc_sysctl.c @@ -480,7 +480,7 @@ static struct inode *proc_sys_make_inode(struct super_block *sb, } if (root->set_ownership) - root->set_ownership(head, table, &inode->i_uid, &inode->i_gid); + root->set_ownership(head, &inode->i_uid, &inode->i_gid); else { inode->i_uid = GLOBAL_ROOT_UID; inode->i_gid = GLOBAL_ROOT_GID; diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h index ee7d33b89e9e..60333a6b9370 100644 --- a/include/linux/sysctl.h +++ b/include/linux/sysctl.h @@ -205,7 +205,6 @@ struct ctl_table_root { struct ctl_table_set default_set; struct ctl_table_set *(*lookup)(struct ctl_table_root *root); void (*set_ownership)(struct ctl_table_header *head, - struct ctl_table *table, kuid_t *uid, kgid_t *gid); int (*permissions)(struct ctl_table_header *head, struct ctl_table *table); }; diff --git a/ipc/ipc_sysctl.c b/ipc/ipc_sysctl.c index 45cb1dabce29..1a5085e5b178 100644 --- a/ipc/ipc_sysctl.c +++ b/ipc/ipc_sysctl.c @@ -192,7 +192,6 @@ static int set_is_seen(struct ctl_table_set *set) } static void ipc_set_ownership(struct ctl_table_header *head, - struct ctl_table *table, kuid_t *uid, kgid_t *gid) { struct ipc_namespace *ns = @@ -224,7 +223,7 @@ static int ipc_permissions(struct ctl_table_header *head, struct ctl_table *tabl kuid_t ns_root_uid; kgid_t ns_root_gid; - ipc_set_ownership(head, table, &ns_root_uid, &ns_root_gid); + ipc_set_ownership(head, &ns_root_uid, &ns_root_gid); if (uid_eq(current_euid(), ns_root_uid)) mode >>= 6; diff --git a/ipc/mq_sysctl.c b/ipc/mq_sysctl.c index 21fba3a6edaf..6bb1c5397c69 100644 --- a/ipc/mq_sysctl.c +++ b/ipc/mq_sysctl.c @@ -78,7 +78,6 @@ static int set_is_seen(struct ctl_table_set *set) } static void mq_set_ownership(struct ctl_table_header *head, - struct ctl_table *table, kuid_t *uid, kgid_t *gid) { struct ipc_namespace *ns = @@ -97,7 +96,7 @@ static int mq_permissions(struct ctl_table_header *head, struct ctl_table *table kuid_t ns_root_uid; kgid_t ns_root_gid; - mq_set_ownership(head, table, &ns_root_uid, &ns_root_gid); + mq_set_ownership(head, &ns_root_uid, &ns_root_gid); if (uid_eq(current_euid(), ns_root_uid)) mode >>= 6; diff --git a/net/sysctl_net.c b/net/sysctl_net.c index 051ed5f6fc93..a0a7a79991f9 100644 --- a/net/sysctl_net.c +++ b/net/sysctl_net.c @@ -54,7 +54,6 @@ static int net_ctl_permissions(struct ctl_table_header *head, } static void net_ctl_set_ownership(struct ctl_table_header *head, - struct ctl_table *table, kuid_t *uid, kgid_t *gid) { struct net *net = container_of(head->set, struct net, sysctls);
The argument is never used and can be removed. In a future commit the sysctl core will only use "const struct ctl_table". Removing it here is a preparation for this consitifcation. The patch was created with the following coccinelle script: @@ identifier func, head, table, uid, gid; @@ void func( struct ctl_table_header *head, - struct ctl_table *table, kuid_t *uid, kgid_t *gid) { ... } The single changed location was validate through manual inspection and compilation. In addition, a search for 'set_ownership' was done over the full tree to look for places that were missed by coccinelle. None were found. Signed-off-by: Thomas Weißschuh <linux@weissschuh.net> --- fs/proc/proc_sysctl.c | 2 +- include/linux/sysctl.h | 1 - ipc/ipc_sysctl.c | 3 +-- ipc/mq_sysctl.c | 3 +-- net/sysctl_net.c | 1 - 5 files changed, 3 insertions(+), 7 deletions(-)