diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2012-10-11 11:42:01 -0400 |
|---|---|---|
| committer | Ziyan <jaraidaniel@gmail.com> | 2016-03-11 16:08:11 +0100 |
| commit | 9cd34ebb3ab309a71cb460fa079b820c44111d0d (patch) | |
| tree | 3bae0b26d4719bd5f7243a256a5273267a6de7cd /security/tomoyo | |
| parent | 79a251bb57e4ff32e397eb6d78a3285ded7b9d7b (diff) | |
| download | kernel_samsung_espresso10-9cd34ebb3ab309a71cb460fa079b820c44111d0d.zip kernel_samsung_espresso10-9cd34ebb3ab309a71cb460fa079b820c44111d0d.tar.gz kernel_samsung_espresso10-9cd34ebb3ab309a71cb460fa079b820c44111d0d.tar.bz2 | |
consitify do_mount() arguments
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
(cherry picked from commit 808d4e3cfdcc52b19276175464f6dbca4df13b09)
Diffstat (limited to 'security/tomoyo')
| -rw-r--r-- | security/tomoyo/common.h | 2 | ||||
| -rw-r--r-- | security/tomoyo/mount.c | 5 | ||||
| -rw-r--r-- | security/tomoyo/tomoyo.c | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/security/tomoyo/common.h b/security/tomoyo/common.h index 7c66bd8..ec80711 100644 --- a/security/tomoyo/common.h +++ b/security/tomoyo/common.h @@ -757,7 +757,7 @@ int tomoyo_init_request_info(struct tomoyo_request_info *r, struct tomoyo_domain_info *domain, const u8 index); /* Check permission for mount operation. */ -int tomoyo_mount_permission(char *dev_name, struct path *path, char *type, +int tomoyo_mount_permission(const char *dev_name, struct path *path, const char *type, unsigned long flags, void *data_page); /* Create "aggregator" entry in exception policy. */ int tomoyo_write_aggregator(char *data, const bool is_delete); diff --git a/security/tomoyo/mount.c b/security/tomoyo/mount.c index 892494a..951a245 100644 --- a/security/tomoyo/mount.c +++ b/security/tomoyo/mount.c @@ -85,7 +85,8 @@ static bool tomoyo_check_mount_acl(struct tomoyo_request_info *r, * * Caller holds tomoyo_read_lock(). */ -static int tomoyo_mount_acl(struct tomoyo_request_info *r, char *dev_name, +static int tomoyo_mount_acl(struct tomoyo_request_info *r, + const char *dev_name, struct path *dir, char *type, unsigned long flags) { struct path path; @@ -190,7 +191,7 @@ static int tomoyo_mount_acl(struct tomoyo_request_info *r, char *dev_name, * * Returns 0 on success, negative value otherwise. */ -int tomoyo_mount_permission(char *dev_name, struct path *path, char *type, +int tomoyo_mount_permission(const char *dev_name, struct path *path, const char *type, unsigned long flags, void *data_page) { struct tomoyo_request_info r; diff --git a/security/tomoyo/tomoyo.c b/security/tomoyo/tomoyo.c index 95d3f95..a04d6aa 100644 --- a/security/tomoyo/tomoyo.c +++ b/security/tomoyo/tomoyo.c @@ -219,8 +219,8 @@ static int tomoyo_path_chroot(struct path *path) return tomoyo_path_perm(TOMOYO_TYPE_CHROOT, path); } -static int tomoyo_sb_mount(char *dev_name, struct path *path, - char *type, unsigned long flags, void *data) +static int tomoyo_sb_mount(const char *dev_name, struct path *path, + const char *type, unsigned long flags, void *data) { return tomoyo_mount_permission(dev_name, path, type, flags, data); } |