diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2012-10-11 11:42:01 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-10-11 20:02:04 -0400 |
commit | 808d4e3cfdcc52b19276175464f6dbca4df13b09 (patch) | |
tree | 11c319127e8c1314c1ed1a777e4284032ab5bd00 /security | |
parent | 4b2c551f77f5a0c496e2125b1d883f4b26aabf2c (diff) |
consitify do_mount() arguments
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'security')
-rw-r--r-- | security/capability.c | 4 | ||||
-rw-r--r-- | security/security.c | 4 | ||||
-rw-r--r-- | security/selinux/hooks.c | 4 | ||||
-rw-r--r-- | security/smack/smack_lsm.c | 4 | ||||
-rw-r--r-- | security/tomoyo/common.h | 2 | ||||
-rw-r--r-- | security/tomoyo/mount.c | 5 | ||||
-rw-r--r-- | security/tomoyo/tomoyo.c | 4 |
7 files changed, 14 insertions, 13 deletions
diff --git a/security/capability.c b/security/capability.c index a40aac677c72..b14a30c234b8 100644 --- a/security/capability.c +++ b/security/capability.c | |||
@@ -74,8 +74,8 @@ static int cap_sb_statfs(struct dentry *dentry) | |||
74 | return 0; | 74 | return 0; |
75 | } | 75 | } |
76 | 76 | ||
77 | static int cap_sb_mount(char *dev_name, struct path *path, char *type, | 77 | static int cap_sb_mount(const char *dev_name, struct path *path, |
78 | unsigned long flags, void *data) | 78 | const char *type, unsigned long flags, void *data) |
79 | { | 79 | { |
80 | return 0; | 80 | return 0; |
81 | } | 81 | } |
diff --git a/security/security.c b/security/security.c index 3724029d0f6d..8dcd4ae10a5f 100644 --- a/security/security.c +++ b/security/security.c | |||
@@ -276,8 +276,8 @@ int security_sb_statfs(struct dentry *dentry) | |||
276 | return security_ops->sb_statfs(dentry); | 276 | return security_ops->sb_statfs(dentry); |
277 | } | 277 | } |
278 | 278 | ||
279 | int security_sb_mount(char *dev_name, struct path *path, | 279 | int security_sb_mount(const char *dev_name, struct path *path, |
280 | char *type, unsigned long flags, void *data) | 280 | const char *type, unsigned long flags, void *data) |
281 | { | 281 | { |
282 | return security_ops->sb_mount(dev_name, path, type, flags, data); | 282 | return security_ops->sb_mount(dev_name, path, type, flags, data); |
283 | } | 283 | } |
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index 651d8456611a..24ab4148547c 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c | |||
@@ -2452,9 +2452,9 @@ static int selinux_sb_statfs(struct dentry *dentry) | |||
2452 | return superblock_has_perm(cred, dentry->d_sb, FILESYSTEM__GETATTR, &ad); | 2452 | return superblock_has_perm(cred, dentry->d_sb, FILESYSTEM__GETATTR, &ad); |
2453 | } | 2453 | } |
2454 | 2454 | ||
2455 | static int selinux_mount(char *dev_name, | 2455 | static int selinux_mount(const char *dev_name, |
2456 | struct path *path, | 2456 | struct path *path, |
2457 | char *type, | 2457 | const char *type, |
2458 | unsigned long flags, | 2458 | unsigned long flags, |
2459 | void *data) | 2459 | void *data) |
2460 | { | 2460 | { |
diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c index 2874c7316783..38be92ce901e 100644 --- a/security/smack/smack_lsm.c +++ b/security/smack/smack_lsm.c | |||
@@ -408,8 +408,8 @@ static int smack_sb_statfs(struct dentry *dentry) | |||
408 | * Returns 0 if current can write the floor of the filesystem | 408 | * Returns 0 if current can write the floor of the filesystem |
409 | * being mounted on, an error code otherwise. | 409 | * being mounted on, an error code otherwise. |
410 | */ | 410 | */ |
411 | static int smack_sb_mount(char *dev_name, struct path *path, | 411 | static int smack_sb_mount(const char *dev_name, struct path *path, |
412 | char *type, unsigned long flags, void *data) | 412 | const char *type, unsigned long flags, void *data) |
413 | { | 413 | { |
414 | struct superblock_smack *sbp = path->dentry->d_sb->s_security; | 414 | struct superblock_smack *sbp = path->dentry->d_sb->s_security; |
415 | struct smk_audit_info ad; | 415 | struct smk_audit_info ad; |
diff --git a/security/tomoyo/common.h b/security/tomoyo/common.h index af010b62d544..d4f166bc3508 100644 --- a/security/tomoyo/common.h +++ b/security/tomoyo/common.h | |||
@@ -970,7 +970,7 @@ int tomoyo_init_request_info(struct tomoyo_request_info *r, | |||
970 | const u8 index); | 970 | const u8 index); |
971 | int tomoyo_mkdev_perm(const u8 operation, struct path *path, | 971 | int tomoyo_mkdev_perm(const u8 operation, struct path *path, |
972 | const unsigned int mode, unsigned int dev); | 972 | const unsigned int mode, unsigned int dev); |
973 | int tomoyo_mount_permission(char *dev_name, struct path *path, | 973 | int tomoyo_mount_permission(const char *dev_name, struct path *path, |
974 | const char *type, unsigned long flags, | 974 | const char *type, unsigned long flags, |
975 | void *data_page); | 975 | void *data_page); |
976 | int tomoyo_open_control(const u8 type, struct file *file); | 976 | int tomoyo_open_control(const u8 type, struct file *file); |
diff --git a/security/tomoyo/mount.c b/security/tomoyo/mount.c index fe00cdfd0267..390c646013cb 100644 --- a/security/tomoyo/mount.c +++ b/security/tomoyo/mount.c | |||
@@ -71,7 +71,8 @@ static bool tomoyo_check_mount_acl(struct tomoyo_request_info *r, | |||
71 | * | 71 | * |
72 | * Caller holds tomoyo_read_lock(). | 72 | * Caller holds tomoyo_read_lock(). |
73 | */ | 73 | */ |
74 | static int tomoyo_mount_acl(struct tomoyo_request_info *r, char *dev_name, | 74 | static int tomoyo_mount_acl(struct tomoyo_request_info *r, |
75 | const char *dev_name, | ||
75 | struct path *dir, const char *type, | 76 | struct path *dir, const char *type, |
76 | unsigned long flags) | 77 | unsigned long flags) |
77 | { | 78 | { |
@@ -183,7 +184,7 @@ static int tomoyo_mount_acl(struct tomoyo_request_info *r, char *dev_name, | |||
183 | * | 184 | * |
184 | * Returns 0 on success, negative value otherwise. | 185 | * Returns 0 on success, negative value otherwise. |
185 | */ | 186 | */ |
186 | int tomoyo_mount_permission(char *dev_name, struct path *path, | 187 | int tomoyo_mount_permission(const char *dev_name, struct path *path, |
187 | const char *type, unsigned long flags, | 188 | const char *type, unsigned long flags, |
188 | void *data_page) | 189 | void *data_page) |
189 | { | 190 | { |
diff --git a/security/tomoyo/tomoyo.c b/security/tomoyo/tomoyo.c index d88eb3a046ed..a2ee362546ab 100644 --- a/security/tomoyo/tomoyo.c +++ b/security/tomoyo/tomoyo.c | |||
@@ -408,8 +408,8 @@ static int tomoyo_path_chroot(struct path *path) | |||
408 | * | 408 | * |
409 | * Returns 0 on success, negative value otherwise. | 409 | * Returns 0 on success, negative value otherwise. |
410 | */ | 410 | */ |
411 | static int tomoyo_sb_mount(char *dev_name, struct path *path, | 411 | static int tomoyo_sb_mount(const char *dev_name, struct path *path, |
412 | char *type, unsigned long flags, void *data) | 412 | const char *type, unsigned long flags, void *data) |
413 | { | 413 | { |
414 | return tomoyo_mount_permission(dev_name, path, type, flags, data); | 414 | return tomoyo_mount_permission(dev_name, path, type, flags, data); |
415 | } | 415 | } |