diff options
| -rw-r--r-- | include/linux/lsm_hooks.h | 2 | ||||
| -rw-r--r-- | include/linux/security.h | 4 | ||||
| -rw-r--r-- | security/security.c | 2 | ||||
| -rw-r--r-- | security/tomoyo/tomoyo.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/lsm_hooks.h b/include/linux/lsm_hooks.h index 52c2ac5f4855..e2baca48e596 100644 --- a/include/linux/lsm_hooks.h +++ b/include/linux/lsm_hooks.h | |||
| @@ -1376,7 +1376,7 @@ union security_list_options { | |||
| 1376 | struct dentry *new_dentry); | 1376 | struct dentry *new_dentry); |
| 1377 | int (*path_chmod)(const struct path *path, umode_t mode); | 1377 | int (*path_chmod)(const struct path *path, umode_t mode); |
| 1378 | int (*path_chown)(const struct path *path, kuid_t uid, kgid_t gid); | 1378 | int (*path_chown)(const struct path *path, kuid_t uid, kgid_t gid); |
| 1379 | int (*path_chroot)(struct path *path); | 1379 | int (*path_chroot)(const struct path *path); |
| 1380 | #endif | 1380 | #endif |
| 1381 | 1381 | ||
| 1382 | int (*inode_alloc_security)(struct inode *inode); | 1382 | int (*inode_alloc_security)(struct inode *inode); |
diff --git a/include/linux/security.h b/include/linux/security.h index 82854115e36b..cb53cffbfae4 100644 --- a/include/linux/security.h +++ b/include/linux/security.h | |||
| @@ -1457,7 +1457,7 @@ int security_path_rename(const struct path *old_dir, struct dentry *old_dentry, | |||
| 1457 | unsigned int flags); | 1457 | unsigned int flags); |
| 1458 | int security_path_chmod(const struct path *path, umode_t mode); | 1458 | int security_path_chmod(const struct path *path, umode_t mode); |
| 1459 | int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid); | 1459 | int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid); |
| 1460 | int security_path_chroot(struct path *path); | 1460 | int security_path_chroot(const struct path *path); |
| 1461 | #else /* CONFIG_SECURITY_PATH */ | 1461 | #else /* CONFIG_SECURITY_PATH */ |
| 1462 | static inline int security_path_unlink(const struct path *dir, struct dentry *dentry) | 1462 | static inline int security_path_unlink(const struct path *dir, struct dentry *dentry) |
| 1463 | { | 1463 | { |
| @@ -1518,7 +1518,7 @@ static inline int security_path_chown(const struct path *path, kuid_t uid, kgid_ | |||
| 1518 | return 0; | 1518 | return 0; |
| 1519 | } | 1519 | } |
| 1520 | 1520 | ||
| 1521 | static inline int security_path_chroot(struct path *path) | 1521 | static inline int security_path_chroot(const struct path *path) |
| 1522 | { | 1522 | { |
| 1523 | return 0; | 1523 | return 0; |
| 1524 | } | 1524 | } |
diff --git a/security/security.c b/security/security.c index 33b85a960128..cf6f31df524a 100644 --- a/security/security.c +++ b/security/security.c | |||
| @@ -499,7 +499,7 @@ int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid) | |||
| 499 | return call_int_hook(path_chown, 0, path, uid, gid); | 499 | return call_int_hook(path_chown, 0, path, uid, gid); |
| 500 | } | 500 | } |
| 501 | 501 | ||
| 502 | int security_path_chroot(struct path *path) | 502 | int security_path_chroot(const struct path *path) |
| 503 | { | 503 | { |
| 504 | return call_int_hook(path_chroot, 0, path); | 504 | return call_int_hook(path_chroot, 0, path); |
| 505 | } | 505 | } |
diff --git a/security/tomoyo/tomoyo.c b/security/tomoyo/tomoyo.c index 6a858f2f4063..c7764bb747aa 100644 --- a/security/tomoyo/tomoyo.c +++ b/security/tomoyo/tomoyo.c | |||
| @@ -385,7 +385,7 @@ static int tomoyo_path_chown(const struct path *path, kuid_t uid, kgid_t gid) | |||
| 385 | * | 385 | * |
| 386 | * Returns 0 on success, negative value otherwise. | 386 | * Returns 0 on success, negative value otherwise. |
| 387 | */ | 387 | */ |
| 388 | static int tomoyo_path_chroot(struct path *path) | 388 | static int tomoyo_path_chroot(const struct path *path) |
| 389 | { | 389 | { |
| 390 | return tomoyo_path_perm(TOMOYO_TYPE_CHROOT, path, NULL); | 390 | return tomoyo_path_perm(TOMOYO_TYPE_CHROOT, path, NULL); |
| 391 | } | 391 | } |
