moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "fs: add is_idmapped_mnt() helper"

Browse Source 
This reverts commit bac0953c9f.
This commit is contained in:
Jaegeuk Kim
2023-01-04 13:00:04 -08:00
parent 5094968a00
commit fe2d3c2473
7 changed files with 6 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fs/cachefiles/bind.c
View File

@@ -117,7 +117,7 @@ static int cachefiles_daemon_add_cache(struct cachefiles_cache *cache)
root = path.dentry; root = path.dentry;
ret = -EINVAL; ret = -EINVAL;
if (is_idmapped_mnt(path.mnt)) { if (mnt_user_ns(path.mnt) != &init_user_ns) {
pr_warn("File cache on idmapped mounts not supported"); pr_warn("File cache on idmapped mounts not supported");
goto error_unsupported; goto error_unsupported;
} }

2
fs/ecryptfs/main.c
View File

@@ -537,7 +537,7 @@ static struct dentry *ecryptfs_mount(struct file_system_type *fs_type, int flags
goto out_free; goto out_free;
} }
if (is_idmapped_mnt(path.mnt)) { if (mnt_user_ns(path.mnt) != &init_user_ns) {
rc = -EINVAL; rc = -EINVAL;
printk(KERN_ERR "Mounting on idmapped mounts currently disallowed\n"); printk(KERN_ERR "Mounting on idmapped mounts currently disallowed\n");
goto out_free; goto out_free;

2
fs/namespace.c
View File

@@ -3936,7 +3936,7 @@ static int can_idmap_mount(const struct mount_kattr *kattr, struct mount *mnt)
* mapping. It makes things simpler and callers can just create * mapping. It makes things simpler and callers can just create
* another bind-mount they can idmap if they want to. * another bind-mount they can idmap if they want to.
*/ */
if (is_idmapped_mnt(m)) if (mnt_user_ns(m) != &init_user_ns)
return -EPERM; return -EPERM;
/* The underlying filesystem doesn't support idmapped mounts yet. */ /* The underlying filesystem doesn't support idmapped mounts yet. */

2
fs/nfsd/export.c
View File

@@ -427,7 +427,7 @@ static int check_export(struct path *path, int *flags, unsigned char *uuid)
return -EINVAL; return -EINVAL;
} }
if (is_idmapped_mnt(path->mnt)) { if (mnt_user_ns(path->mnt) != &init_user_ns) {
dprintk("exp_export: export of idmapped mounts not yet supported.\n"); dprintk("exp_export: export of idmapped mounts not yet supported.\n");
return -EINVAL; return -EINVAL;
} }

2
fs/overlayfs/super.c
View File

@@ -869,7 +869,7 @@ static int ovl_mount_dir_noesc(const char *name, struct path *path)
pr_err("filesystem on '%s' not supported\n", name); pr_err("filesystem on '%s' not supported\n", name);
goto out_put; goto out_put;
} }
if (is_idmapped_mnt(path->mnt)) { if (mnt_user_ns(path->mnt) != &init_user_ns) {
pr_err("idmapped layers are currently not supported\n"); pr_err("idmapped layers are currently not supported\n");
goto out_put; goto out_put;
} }

2
fs/proc_namespace.c
View File

@@ -80,7 +80,7 @@ static void show_mnt_opts(struct seq_file *m, struct vfsmount *mnt)
seq_puts(m, fs_infop->str); seq_puts(m, fs_infop->str);
} }
if (is_idmapped_mnt(mnt)) if (mnt_user_ns(mnt) != &init_user_ns)
seq_puts(m, ",idmapped"); seq_puts(m, ",idmapped");
} }

14
include/linux/fs.h
View File

@@ -2724,20 +2724,6 @@ 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);
} }
/**
* is_idmapped_mnt - check whether a mount is mapped
* @mnt: the mount to check
*
* If @mnt has an idmapping attached to it @mnt is mapped.
*
* Return: true if mount is mapped, false if not.
*/
static inline bool is_idmapped_mnt(const struct vfsmount *mnt)
{
return mnt_user_ns(mnt) != &init_user_ns;
}
extern long vfs_truncate(const struct path *, loff_t); extern long vfs_truncate(const struct path *, loff_t);
int do_truncate(struct user_namespace *, struct dentry *, loff_t start, int do_truncate(struct user_namespace *, struct dentry *, loff_t start,
unsigned int time_attrs, struct file *filp); unsigned int time_attrs, struct file *filp);