mirror of
https://github.com/torvalds/linux.git
synced 2024-11-12 23:23:03 +00:00
sysctl: treewide: constify argument ctl_table_root::permissions(table)
The permissions callback should not modify the ctl_table. Enforce this expectation via the typesystem. This is a step to put "struct ctl_table" into .rodata throughout the kernel. The patch was created with the following coccinelle script: @@ identifier func, head, ctl; @@ int func( struct ctl_table_header *head, - struct ctl_table *ctl) + const struct ctl_table *ctl) { ... } (insert_entry() from fs/proc/proc_sysctl.c is a false-positive) No additional occurrences of '.permissions =' were found after a tree-wide search for places missed by the conccinelle script. Reviewed-by: Joel Granados <j.granados@samsung.com> Signed-off-by: Thomas Weißschuh <linux@weissschuh.net> Signed-off-by: Joel Granados <j.granados@samsung.com>
This commit is contained in:
parent
520713a93d
commit
795f90c6f1
@ -206,7 +206,7 @@ struct ctl_table_root {
|
|||||||
struct ctl_table_set *(*lookup)(struct ctl_table_root *root);
|
struct ctl_table_set *(*lookup)(struct ctl_table_root *root);
|
||||||
void (*set_ownership)(struct ctl_table_header *head,
|
void (*set_ownership)(struct ctl_table_header *head,
|
||||||
kuid_t *uid, kgid_t *gid);
|
kuid_t *uid, kgid_t *gid);
|
||||||
int (*permissions)(struct ctl_table_header *head, struct ctl_table *table);
|
int (*permissions)(struct ctl_table_header *head, const struct ctl_table *table);
|
||||||
};
|
};
|
||||||
|
|
||||||
#define register_sysctl(path, table) \
|
#define register_sysctl(path, table) \
|
||||||
|
@ -204,7 +204,7 @@ static void ipc_set_ownership(struct ctl_table_header *head,
|
|||||||
*gid = gid_valid(ns_root_gid) ? ns_root_gid : GLOBAL_ROOT_GID;
|
*gid = gid_valid(ns_root_gid) ? ns_root_gid : GLOBAL_ROOT_GID;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int ipc_permissions(struct ctl_table_header *head, struct ctl_table *table)
|
static int ipc_permissions(struct ctl_table_header *head, const struct ctl_table *table)
|
||||||
{
|
{
|
||||||
int mode = table->mode;
|
int mode = table->mode;
|
||||||
|
|
||||||
|
@ -90,7 +90,7 @@ static void mq_set_ownership(struct ctl_table_header *head,
|
|||||||
*gid = gid_valid(ns_root_gid) ? ns_root_gid : GLOBAL_ROOT_GID;
|
*gid = gid_valid(ns_root_gid) ? ns_root_gid : GLOBAL_ROOT_GID;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int mq_permissions(struct ctl_table_header *head, struct ctl_table *table)
|
static int mq_permissions(struct ctl_table_header *head, const struct ctl_table *table)
|
||||||
{
|
{
|
||||||
int mode = table->mode;
|
int mode = table->mode;
|
||||||
kuid_t ns_root_uid;
|
kuid_t ns_root_uid;
|
||||||
|
@ -38,7 +38,7 @@ static int set_is_seen(struct ctl_table_set *set)
|
|||||||
}
|
}
|
||||||
|
|
||||||
static int set_permissions(struct ctl_table_header *head,
|
static int set_permissions(struct ctl_table_header *head,
|
||||||
struct ctl_table *table)
|
const struct ctl_table *table)
|
||||||
{
|
{
|
||||||
struct user_namespace *user_ns =
|
struct user_namespace *user_ns =
|
||||||
container_of(head->set, struct user_namespace, set);
|
container_of(head->set, struct user_namespace, set);
|
||||||
|
@ -40,7 +40,7 @@ static int is_seen(struct ctl_table_set *set)
|
|||||||
|
|
||||||
/* Return standard mode bits for table entry. */
|
/* Return standard mode bits for table entry. */
|
||||||
static int net_ctl_permissions(struct ctl_table_header *head,
|
static int net_ctl_permissions(struct ctl_table_header *head,
|
||||||
struct ctl_table *table)
|
const struct ctl_table *table)
|
||||||
{
|
{
|
||||||
struct net *net = container_of(head->set, struct net, sysctls);
|
struct net *net = container_of(head->set, struct net, sysctls);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user