Commit 520713a9 authored by Thomas Weißschuh's avatar Thomas Weißschuh Committed by Joel Granados
Browse files

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: default avatarJoel Granados <j.granados@samsung.com>
Signed-off-by: default avatarThomas Weißschuh <linux@weissschuh.net>
Signed-off-by: default avatarJoel Granados <j.granados@samsung.com>
parent 1adb825a

fs/proc/proc_sysctl.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

include/linux/sysctl.h

+0 −1
Original line number Diff line number Diff line
@@ -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);

};

ipc/ipc_sysctl.c

+1 −2
Original line number Diff line number Diff line
@@ -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;

ipc/mq_sysctl.c

+1 −2
Original line number Diff line number Diff line
@@ -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;

net/sysctl_net.c

+0 −1
Original line number Diff line number Diff line
@@ -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);