summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/lsm_hooks.h2
-rw-r--r--include/linux/security.h6
-rw-r--r--security/security.c2
-rw-r--r--security/tomoyo/tomoyo.c2
4 files changed, 6 insertions, 6 deletions
diff --git a/include/linux/lsm_hooks.h b/include/linux/lsm_hooks.h
index e2baca48e596..41c0aa6d39ea 100644
--- a/include/linux/lsm_hooks.h
+++ b/include/linux/lsm_hooks.h
@@ -1346,7 +1346,7 @@ union security_list_options {
1346 int (*sb_mount)(const char *dev_name, const struct path *path, 1346 int (*sb_mount)(const char *dev_name, const struct path *path,
1347 const char *type, unsigned long flags, void *data); 1347 const char *type, unsigned long flags, void *data);
1348 int (*sb_umount)(struct vfsmount *mnt, int flags); 1348 int (*sb_umount)(struct vfsmount *mnt, int flags);
1349 int (*sb_pivotroot)(struct path *old_path, struct path *new_path); 1349 int (*sb_pivotroot)(const struct path *old_path, const struct path *new_path);
1350 int (*sb_set_mnt_opts)(struct super_block *sb, 1350 int (*sb_set_mnt_opts)(struct super_block *sb,
1351 struct security_mnt_opts *opts, 1351 struct security_mnt_opts *opts,
1352 unsigned long kern_flags, 1352 unsigned long kern_flags,
diff --git a/include/linux/security.h b/include/linux/security.h
index cb53cffbfae4..fcfa211c694f 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -225,7 +225,7 @@ int security_sb_statfs(struct dentry *dentry);
225int security_sb_mount(const char *dev_name, const struct path *path, 225int security_sb_mount(const char *dev_name, const struct path *path,
226 const char *type, unsigned long flags, void *data); 226 const char *type, unsigned long flags, void *data);
227int security_sb_umount(struct vfsmount *mnt, int flags); 227int security_sb_umount(struct vfsmount *mnt, int flags);
228int security_sb_pivotroot(struct path *old_path, struct path *new_path); 228int security_sb_pivotroot(const struct path *old_path, const struct path *new_path);
229int security_sb_set_mnt_opts(struct super_block *sb, 229int security_sb_set_mnt_opts(struct super_block *sb,
230 struct security_mnt_opts *opts, 230 struct security_mnt_opts *opts,
231 unsigned long kern_flags, 231 unsigned long kern_flags,
@@ -542,8 +542,8 @@ static inline int security_sb_umount(struct vfsmount *mnt, int flags)
542 return 0; 542 return 0;
543} 543}
544 544
545static inline int security_sb_pivotroot(struct path *old_path, 545static inline int security_sb_pivotroot(const struct path *old_path,
546 struct path *new_path) 546 const struct path *new_path)
547{ 547{
548 return 0; 548 return 0;
549} 549}
diff --git a/security/security.c b/security/security.c
index cf6f31df524a..f7af0aaa173e 100644
--- a/security/security.c
+++ b/security/security.c
@@ -313,7 +313,7 @@ int security_sb_umount(struct vfsmount *mnt, int flags)
313 return call_int_hook(sb_umount, 0, mnt, flags); 313 return call_int_hook(sb_umount, 0, mnt, flags);
314} 314}
315 315
316int security_sb_pivotroot(struct path *old_path, struct path *new_path) 316int security_sb_pivotroot(const struct path *old_path, const struct path *new_path)
317{ 317{
318 return call_int_hook(sb_pivotroot, 0, old_path, new_path); 318 return call_int_hook(sb_pivotroot, 0, old_path, new_path);
319} 319}
diff --git a/security/tomoyo/tomoyo.c b/security/tomoyo/tomoyo.c
index c7764bb747aa..75c998700190 100644
--- a/security/tomoyo/tomoyo.c
+++ b/security/tomoyo/tomoyo.c
@@ -429,7 +429,7 @@ static int tomoyo_sb_umount(struct vfsmount *mnt, int flags)
429 * 429 *
430 * Returns 0 on success, negative value otherwise. 430 * Returns 0 on success, negative value otherwise.
431 */ 431 */
432static int tomoyo_sb_pivotroot(struct path *old_path, struct path *new_path) 432static int tomoyo_sb_pivotroot(const struct path *old_path, const struct path *new_path)
433{ 433{
434 return tomoyo_path2_perm(TOMOYO_TYPE_PIVOT_ROOT, new_path, old_path); 434 return tomoyo_path2_perm(TOMOYO_TYPE_PIVOT_ROOT, new_path, old_path);
435} 435}