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

Commit 7fd25dac authored by Al Viro's avatar Al Viro
Browse files

constify chown_common/security_path_chown 



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

fs/open.c

+1 −1
Original line number Diff line number Diff line
@@ -564,7 +564,7 @@ SYSCALL_DEFINE2(chmod, const char __user *, filename, umode_t, mode) 
	return sys_fchmodat(AT_FDCWD, filename, mode);

}



static int chown_common(struct path *path, uid_t user, gid_t group)

static int chown_common(const struct path *path, uid_t user, gid_t group)

{

	struct inode *inode = path->dentry->d_inode;

	struct inode *delegated_inode = NULL;

include/linux/lsm_hooks.h

+1 −1
Original line number Diff line number Diff line
@@ -1375,7 +1375,7 @@ union security_list_options { 
				struct path *new_dir,

				struct dentry *new_dentry);

	int (*path_chmod)(struct path *path, umode_t mode);

	int (*path_chown)(struct path *path, kuid_t uid, kgid_t gid);

	int (*path_chown)(const struct path *path, kuid_t uid, kgid_t gid);

	int (*path_chroot)(struct path *path);

#endif

include/linux/security.h

+2 −2
Original line number Diff line number Diff line
@@ -1456,7 +1456,7 @@ int security_path_rename(struct path *old_dir, struct dentry *old_dentry, 
			 struct path *new_dir, struct dentry *new_dentry,

			 unsigned int flags);

int security_path_chmod(struct path *path, umode_t mode);

int security_path_chown(struct path *path, kuid_t uid, kgid_t gid);

int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid);

int security_path_chroot(struct path *path);

#else	/* CONFIG_SECURITY_PATH */

static inline int security_path_unlink(struct path *dir, struct dentry *dentry)
@@ -1513,7 +1513,7 @@ static inline int security_path_chmod(struct path *path, umode_t mode) 
	return 0;

}



static inline int security_path_chown(struct path *path, kuid_t uid, kgid_t gid)

static inline int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid)

{

	return 0;

}

security/apparmor/lsm.c

+1 −1
Original line number Diff line number Diff line
@@ -342,7 +342,7 @@ static int apparmor_path_chmod(struct path *path, umode_t mode) 
	return common_perm_mnt_dentry(OP_CHMOD, path->mnt, path->dentry, AA_MAY_CHMOD);

}



static int apparmor_path_chown(struct path *path, kuid_t uid, kgid_t gid)

static int apparmor_path_chown(const struct path *path, kuid_t uid, kgid_t gid)

{

	struct path_cond cond =  { d_backing_inode(path->dentry)->i_uid,

				   d_backing_inode(path->dentry)->i_mode

security/security.c

+1 −1
Original line number Diff line number Diff line
@@ -492,7 +492,7 @@ int security_path_chmod(struct path *path, umode_t mode) 
	return call_int_hook(path_chmod, 0, path, mode);

}



int security_path_chown(struct path *path, kuid_t uid, kgid_t gid)

int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid)

{

	if (unlikely(IS_PRIVATE(d_backing_inode(path->dentry))))

		return 0;