Enable the init helpers to handle idmapped mounts by passing down the mount's
user namespace.

Cc: Christoph Hellwig <h...@lst.de>
Cc: David Howells <dhowe...@redhat.com>
Cc: Al Viro <v...@zeniv.linux.org.uk>
Cc: linux-fsde...@vger.kernel.org
Signed-off-by: Christian Brauner <christian.brau...@ubuntu.com>
---
/* v2 */
patch introduced
---
 fs/init.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/fs/init.c b/fs/init.c
index 76f493600030..334e4c9c07eb 100644
--- a/fs/init.c
+++ b/fs/init.c
@@ -49,7 +49,7 @@ int __init init_chdir(const char *filename)
        error = kern_path(filename, LOOKUP_FOLLOW | LOOKUP_DIRECTORY, &path);
        if (error)
                return error;
-       error = inode_permission(&init_user_ns, path.dentry->d_inode,
+       error = inode_permission(mnt_user_ns(path.mnt), path.dentry->d_inode,
                                 MAY_EXEC | MAY_CHDIR);
        if (!error)
                set_fs_pwd(current->fs, &path);
@@ -65,7 +65,7 @@ int __init init_chroot(const char *filename)
        error = kern_path(filename, LOOKUP_FOLLOW | LOOKUP_DIRECTORY, &path);
        if (error)
                return error;
-       error = inode_permission(&init_user_ns, path.dentry->d_inode,
+       error = inode_permission(mnt_user_ns(path.mnt), path.dentry->d_inode,
                                 MAY_EXEC | MAY_CHDIR);
        if (error)
                goto dput_and_out;
@@ -120,7 +120,7 @@ int __init init_eaccess(const char *filename)
        error = kern_path(filename, LOOKUP_FOLLOW, &path);
        if (error)
                return error;
-       error = inode_permission(&init_user_ns, d_inode(path.dentry),
+       error = inode_permission(mnt_user_ns(path.mnt), d_inode(path.dentry),
                                 MAY_ACCESS);
        path_put(&path);
        return error;
@@ -190,7 +190,7 @@ int __init init_link(const char *oldname, const char 
*newname)
        error = security_path_link(old_path.dentry, &new_path, new_dentry);
        if (error)
                goto out_dput;
-       error = vfs_link(old_path.dentry, &init_user_ns, 
+       error = vfs_link(old_path.dentry, &init_user_ns,
                         new_path.dentry->d_inode, new_dentry, NULL);
 out_dput:
        done_path_create(&new_path, new_dentry);
-- 
2.29.2

--
Linux-audit mailing list
Linux-audit@redhat.com
https://www.redhat.com/mailman/listinfo/linux-audit

Reply via email to