Hi Greg,
On 2024-08-07 16:59:07+0000, Greg Kroah-Hartman wrote:
> 6.6-stable review patch. If anyone has any objections, please let me know.
I don't think this has any value being backported to any version.
>
> ------------------
>
> From: Thomas Weißschuh <linux@xxxxxxxxxxxxxx>
>
> [ Upstream commit 520713a93d550406dae14d49cdb8778d70cecdfd ]
>
> 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@xxxxxxxxxxx>
> Signed-off-by: Thomas Weißschuh <linux@xxxxxxxxxxxxxx>
> Signed-off-by: Joel Granados <j.granados@xxxxxxxxxxx>
> Stable-dep-of: 98ca62ba9e2b ("sysctl: always initialize i_uid/i_gid")
> Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
> ---
> 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 5b5cdc747cef3..cec67e6a6678f 100644
> --- a/fs/proc/proc_sysctl.c
> +++ b/fs/proc/proc_sysctl.c
> @@ -481,7 +481,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 61b40ea81f4d3..698a71422a14b 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 01c4a50d22b2d..b2f39a86f4734 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 21fba3a6edaf7..6bb1c5397c69b 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 051ed5f6fc937..a0a7a79991f9f 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.43.0
>
>
>
