constify chown_common/security_path_chown
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
parent
e6641eddf0
commit
7fd25dac9a
|
@ -564,7 +564,7 @@ SYSCALL_DEFINE2(chmod, const char __user *, filename, umode_t, mode)
|
||||||
return sys_fchmodat(AT_FDCWD, filename, 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 *inode = path->dentry->d_inode;
|
||||||
struct inode *delegated_inode = NULL;
|
struct inode *delegated_inode = NULL;
|
||||||
|
|
|
@ -1375,7 +1375,7 @@ union security_list_options {
|
||||||
struct path *new_dir,
|
struct path *new_dir,
|
||||||
struct dentry *new_dentry);
|
struct dentry *new_dentry);
|
||||||
int (*path_chmod)(struct path *path, umode_t mode);
|
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);
|
int (*path_chroot)(struct path *path);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -1456,7 +1456,7 @@ int security_path_rename(struct path *old_dir, struct dentry *old_dentry,
|
||||||
struct path *new_dir, struct dentry *new_dentry,
|
struct path *new_dir, struct dentry *new_dentry,
|
||||||
unsigned int flags);
|
unsigned int flags);
|
||||||
int security_path_chmod(struct path *path, umode_t mode);
|
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);
|
int security_path_chroot(struct path *path);
|
||||||
#else /* CONFIG_SECURITY_PATH */
|
#else /* CONFIG_SECURITY_PATH */
|
||||||
static inline int security_path_unlink(struct path *dir, struct dentry *dentry)
|
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;
|
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;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -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);
|
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,
|
struct path_cond cond = { d_backing_inode(path->dentry)->i_uid,
|
||||||
d_backing_inode(path->dentry)->i_mode
|
d_backing_inode(path->dentry)->i_mode
|
||||||
|
|
|
@ -492,7 +492,7 @@ int security_path_chmod(struct path *path, umode_t mode)
|
||||||
return call_int_hook(path_chmod, 0, path, 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))))
|
if (unlikely(IS_PRIVATE(d_backing_inode(path->dentry))))
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -366,7 +366,7 @@ static int tomoyo_path_chmod(struct path *path, umode_t mode)
|
||||||
*
|
*
|
||||||
* Returns 0 on success, negative value otherwise.
|
* Returns 0 on success, negative value otherwise.
|
||||||
*/
|
*/
|
||||||
static int tomoyo_path_chown(struct path *path, kuid_t uid, kgid_t gid)
|
static int tomoyo_path_chown(const struct path *path, kuid_t uid, kgid_t gid)
|
||||||
{
|
{
|
||||||
int error = 0;
|
int error = 0;
|
||||||
if (uid_valid(uid))
|
if (uid_valid(uid))
|
||||||
|
|
Loading…
Reference in New Issue