mirror of https://gitee.com/openkylin/linux.git
open: handle idmapped mounts in do_truncate()
When truncating files the vfs will verify that the caller is privileged over the inode. Extend it to handle idmapped mounts. If the inode is accessed through an idmapped mount it is mapped according to the mount's user namespace. Afterwards the permissions checks are identical to non-idmapped mounts. If the initial user namespace is passed nothing changes so non-idmapped mounts will see identical behavior as before. Link: https://lore.kernel.org/r/20210121131959.646623-16-christian.brauner@ubuntu.com Cc: Christoph Hellwig <hch@lst.de> Cc: David Howells <dhowells@redhat.com> Cc: Al Viro <viro@zeniv.linux.org.uk> Cc: linux-fsdevel@vger.kernel.org Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
This commit is contained in:
parent
6521f89170
commit
643fe55a06
|
@ -703,6 +703,7 @@ void do_coredump(const kernel_siginfo_t *siginfo)
|
||||||
goto close_fail;
|
goto close_fail;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
struct user_namespace *mnt_userns;
|
||||||
struct inode *inode;
|
struct inode *inode;
|
||||||
int open_flags = O_CREAT | O_RDWR | O_NOFOLLOW |
|
int open_flags = O_CREAT | O_RDWR | O_NOFOLLOW |
|
||||||
O_LARGEFILE | O_EXCL;
|
O_LARGEFILE | O_EXCL;
|
||||||
|
@ -780,13 +781,15 @@ void do_coredump(const kernel_siginfo_t *siginfo)
|
||||||
* a process dumps core while its cwd is e.g. on a vfat
|
* a process dumps core while its cwd is e.g. on a vfat
|
||||||
* filesystem.
|
* filesystem.
|
||||||
*/
|
*/
|
||||||
if (!uid_eq(inode->i_uid, current_fsuid()))
|
mnt_userns = file_mnt_user_ns(cprm.file);
|
||||||
|
if (!uid_eq(i_uid_into_mnt(mnt_userns, inode), current_fsuid()))
|
||||||
goto close_fail;
|
goto close_fail;
|
||||||
if ((inode->i_mode & 0677) != 0600)
|
if ((inode->i_mode & 0677) != 0600)
|
||||||
goto close_fail;
|
goto close_fail;
|
||||||
if (!(cprm.file->f_mode & FMODE_CAN_WRITE))
|
if (!(cprm.file->f_mode & FMODE_CAN_WRITE))
|
||||||
goto close_fail;
|
goto close_fail;
|
||||||
if (do_truncate(cprm.file->f_path.dentry, 0, 0, cprm.file))
|
if (do_truncate(mnt_userns, cprm.file->f_path.dentry,
|
||||||
|
0, 0, cprm.file))
|
||||||
goto close_fail;
|
goto close_fail;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -931,7 +934,8 @@ void dump_truncate(struct coredump_params *cprm)
|
||||||
if (file->f_op->llseek && file->f_op->llseek != no_llseek) {
|
if (file->f_op->llseek && file->f_op->llseek != no_llseek) {
|
||||||
offset = file->f_op->llseek(file, 0, SEEK_CUR);
|
offset = file->f_op->llseek(file, 0, SEEK_CUR);
|
||||||
if (i_size_read(file->f_mapping->host) < offset)
|
if (i_size_read(file->f_mapping->host) < offset)
|
||||||
do_truncate(file->f_path.dentry, offset, 0, file);
|
do_truncate(file_mnt_user_ns(file), file->f_path.dentry,
|
||||||
|
offset, 0, file);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(dump_truncate);
|
EXPORT_SYMBOL(dump_truncate);
|
||||||
|
|
|
@ -1903,7 +1903,8 @@ int dentry_needs_remove_privs(struct dentry *dentry)
|
||||||
return mask;
|
return mask;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int __remove_privs(struct dentry *dentry, int kill)
|
static int __remove_privs(struct user_namespace *mnt_userns,
|
||||||
|
struct dentry *dentry, int kill)
|
||||||
{
|
{
|
||||||
struct iattr newattrs;
|
struct iattr newattrs;
|
||||||
|
|
||||||
|
@ -1912,7 +1913,7 @@ static int __remove_privs(struct dentry *dentry, int kill)
|
||||||
* Note we call this on write, so notify_change will not
|
* Note we call this on write, so notify_change will not
|
||||||
* encounter any conflicting delegations:
|
* encounter any conflicting delegations:
|
||||||
*/
|
*/
|
||||||
return notify_change(&init_user_ns, dentry, &newattrs, NULL);
|
return notify_change(mnt_userns, dentry, &newattrs, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -1939,7 +1940,7 @@ int file_remove_privs(struct file *file)
|
||||||
if (kill < 0)
|
if (kill < 0)
|
||||||
return kill;
|
return kill;
|
||||||
if (kill)
|
if (kill)
|
||||||
error = __remove_privs(dentry, kill);
|
error = __remove_privs(file_mnt_user_ns(file), dentry, kill);
|
||||||
if (!error)
|
if (!error)
|
||||||
inode_has_no_xattr(inode);
|
inode_has_no_xattr(inode);
|
||||||
|
|
||||||
|
|
|
@ -3009,7 +3009,7 @@ static int handle_truncate(struct file *filp)
|
||||||
if (!error)
|
if (!error)
|
||||||
error = security_path_truncate(path);
|
error = security_path_truncate(path);
|
||||||
if (!error) {
|
if (!error) {
|
||||||
error = do_truncate(path->dentry, 0,
|
error = do_truncate(&init_user_ns, path->dentry, 0,
|
||||||
ATTR_MTIME|ATTR_CTIME|ATTR_OPEN,
|
ATTR_MTIME|ATTR_CTIME|ATTR_OPEN,
|
||||||
filp);
|
filp);
|
||||||
}
|
}
|
||||||
|
|
16
fs/open.c
16
fs/open.c
|
@ -35,8 +35,8 @@
|
||||||
|
|
||||||
#include "internal.h"
|
#include "internal.h"
|
||||||
|
|
||||||
int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
|
int do_truncate(struct user_namespace *mnt_userns, struct dentry *dentry,
|
||||||
struct file *filp)
|
loff_t length, unsigned int time_attrs, struct file *filp)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
struct iattr newattrs;
|
struct iattr newattrs;
|
||||||
|
@ -61,13 +61,14 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
|
||||||
|
|
||||||
inode_lock(dentry->d_inode);
|
inode_lock(dentry->d_inode);
|
||||||
/* Note any delegations or leases have already been broken: */
|
/* Note any delegations or leases have already been broken: */
|
||||||
ret = notify_change(&init_user_ns, dentry, &newattrs, NULL);
|
ret = notify_change(mnt_userns, dentry, &newattrs, NULL);
|
||||||
inode_unlock(dentry->d_inode);
|
inode_unlock(dentry->d_inode);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
long vfs_truncate(const struct path *path, loff_t length)
|
long vfs_truncate(const struct path *path, loff_t length)
|
||||||
{
|
{
|
||||||
|
struct user_namespace *mnt_userns;
|
||||||
struct inode *inode;
|
struct inode *inode;
|
||||||
long error;
|
long error;
|
||||||
|
|
||||||
|
@ -83,7 +84,8 @@ long vfs_truncate(const struct path *path, loff_t length)
|
||||||
if (error)
|
if (error)
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
error = inode_permission(&init_user_ns, inode, MAY_WRITE);
|
mnt_userns = mnt_user_ns(path->mnt);
|
||||||
|
error = inode_permission(mnt_userns, inode, MAY_WRITE);
|
||||||
if (error)
|
if (error)
|
||||||
goto mnt_drop_write_and_out;
|
goto mnt_drop_write_and_out;
|
||||||
|
|
||||||
|
@ -107,7 +109,7 @@ long vfs_truncate(const struct path *path, loff_t length)
|
||||||
if (!error)
|
if (!error)
|
||||||
error = security_path_truncate(path);
|
error = security_path_truncate(path);
|
||||||
if (!error)
|
if (!error)
|
||||||
error = do_truncate(path->dentry, length, 0, NULL);
|
error = do_truncate(mnt_userns, path->dentry, length, 0, NULL);
|
||||||
|
|
||||||
put_write_and_out:
|
put_write_and_out:
|
||||||
put_write_access(inode);
|
put_write_access(inode);
|
||||||
|
@ -186,13 +188,13 @@ long do_sys_ftruncate(unsigned int fd, loff_t length, int small)
|
||||||
/* Check IS_APPEND on real upper inode */
|
/* Check IS_APPEND on real upper inode */
|
||||||
if (IS_APPEND(file_inode(f.file)))
|
if (IS_APPEND(file_inode(f.file)))
|
||||||
goto out_putf;
|
goto out_putf;
|
||||||
|
|
||||||
sb_start_write(inode->i_sb);
|
sb_start_write(inode->i_sb);
|
||||||
error = locks_verify_truncate(inode, f.file, length);
|
error = locks_verify_truncate(inode, f.file, length);
|
||||||
if (!error)
|
if (!error)
|
||||||
error = security_path_truncate(&f.file->f_path);
|
error = security_path_truncate(&f.file->f_path);
|
||||||
if (!error)
|
if (!error)
|
||||||
error = do_truncate(dentry, length, ATTR_MTIME|ATTR_CTIME, f.file);
|
error = do_truncate(file_mnt_user_ns(f.file), dentry, length,
|
||||||
|
ATTR_MTIME | ATTR_CTIME, f.file);
|
||||||
sb_end_write(inode->i_sb);
|
sb_end_write(inode->i_sb);
|
||||||
out_putf:
|
out_putf:
|
||||||
fdput(f);
|
fdput(f);
|
||||||
|
|
|
@ -2593,8 +2593,8 @@ static inline struct user_namespace *file_mnt_user_ns(struct file *file)
|
||||||
return mnt_user_ns(file->f_path.mnt);
|
return mnt_user_ns(file->f_path.mnt);
|
||||||
}
|
}
|
||||||
extern long vfs_truncate(const struct path *, loff_t);
|
extern long vfs_truncate(const struct path *, loff_t);
|
||||||
extern int do_truncate(struct dentry *, loff_t start, unsigned int time_attrs,
|
int do_truncate(struct user_namespace *, struct dentry *, loff_t start,
|
||||||
struct file *filp);
|
unsigned int time_attrs, struct file *filp);
|
||||||
extern int vfs_fallocate(struct file *file, int mode, loff_t offset,
|
extern int vfs_fallocate(struct file *file, int mode, loff_t offset,
|
||||||
loff_t len);
|
loff_t len);
|
||||||
extern long do_sys_open(int dfd, const char __user *filename, int flags,
|
extern long do_sys_open(int dfd, const char __user *filename, int flags,
|
||||||
|
|
Loading…
Reference in New Issue