Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3b73b68c authored by Al Viro's avatar Al Viro
Browse files

constify security_sb_pivotroot() 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 77b286c0

include/linux/lsm_hooks.h

+1 −1
Original line number Diff line number Diff line
@@ -1346,7 +1346,7 @@ union security_list_options { 
	int (*sb_mount)(const char *dev_name, const struct path *path,

			const char *type, unsigned long flags, void *data);

	int (*sb_umount)(struct vfsmount *mnt, int flags);

	int (*sb_pivotroot)(struct path *old_path, struct path *new_path);

	int (*sb_pivotroot)(const struct path *old_path, const struct path *new_path);

	int (*sb_set_mnt_opts)(struct super_block *sb,

				struct security_mnt_opts *opts,

				unsigned long kern_flags,

include/linux/security.h

+3 −3
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ int security_sb_statfs(struct dentry *dentry); 
int security_sb_mount(const char *dev_name, const struct path *path,

		      const char *type, unsigned long flags, void *data);

int security_sb_umount(struct vfsmount *mnt, int flags);

int security_sb_pivotroot(struct path *old_path, struct path *new_path);

int security_sb_pivotroot(const struct path *old_path, const struct path *new_path);

int security_sb_set_mnt_opts(struct super_block *sb,

				struct security_mnt_opts *opts,

				unsigned long kern_flags,
@@ -542,8 +542,8 @@ static inline int security_sb_umount(struct vfsmount *mnt, int flags) 
	return 0;

}



static inline int security_sb_pivotroot(struct path *old_path,

					struct path *new_path)

static inline int security_sb_pivotroot(const struct path *old_path,

					const struct path *new_path)

{

	return 0;

}

security/security.c

+1 −1
Original line number Diff line number Diff line
@@ -313,7 +313,7 @@ int security_sb_umount(struct vfsmount *mnt, int flags) 
	return call_int_hook(sb_umount, 0, mnt, flags);

}



int security_sb_pivotroot(struct path *old_path, struct path *new_path)

int security_sb_pivotroot(const struct path *old_path, const struct path *new_path)

{

	return call_int_hook(sb_pivotroot, 0, old_path, new_path);

}

security/tomoyo/tomoyo.c

+1 −1
Original line number Diff line number Diff line
@@ -429,7 +429,7 @@ static int tomoyo_sb_umount(struct vfsmount *mnt, int flags) 
 *

 * Returns 0 on success, negative value otherwise.

 */

static int tomoyo_sb_pivotroot(struct path *old_path, struct path *new_path)

static int tomoyo_sb_pivotroot(const struct path *old_path, const struct path *new_path)

{

	return tomoyo_path2_perm(TOMOYO_TYPE_PIVOT_ROOT, new_path, old_path);

}