From: Christian Brauner <christian.brauner@ubuntu.com> To: "Stéphane Graber" <stgraber@ubuntu.com>, "Eric W. Biederman" <ebiederm@xmission.com>, "Aleksa Sarai" <cyphar@cyphar.com>, "Jann Horn" <jannh@google.com> Cc: smbarber@chromium.org, Alexander Viro <viro@zeniv.linux.org.uk>, Alexey Dobriyan <adobriyan@gmail.com>, Serge Hallyn <serge@hallyn.com>, James Morris <jmorris@namei.org>, Kees Cook <keescook@chromium.org>, Jonathan Corbet <corbet@lwn.net>, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, containers@lists.linux-foundation.org, linux-security-module@vger.kernel.org, linux-api@vger.kernel.org, Christian Brauner <christian.brauner@ubuntu.com> Subject: [PATCH 03/24] proc: add /proc/<pid>/fsgid_map Date: Tue, 11 Feb 2020 17:57:32 +0100 [thread overview] Message-ID: <20200211165753.356508-4-christian.brauner@ubuntu.com> (raw) In-Reply-To: <20200211165753.356508-1-christian.brauner@ubuntu.com> The /proc/<pid>/fsgid_map file can be written to once to setup an fsgid mapping for a user namespace. Writing to this file has the same restrictions as writing to /proc/<pid>/fsgid_map. root@e1-vm:/# cat /proc/13023/fsgid_map 0 300000 100000 Fsid mappings have always been around. They are currently always identical to the id mappings for a user namespace. This means, currently whenever an fsid needs to be looked up the kernel will use the id mapping of the user namespace. With the introduction of fsid mappings the kernel will now lookup fsids in the fsid mappings of the user namespace. If no fsid mapping exists the kernel will continue looking up fsids in the id mappings of the user namespace. Hence, if a system supports fsid mappings through /proc/<pid>/fs*id_map and a container runtime is not aware of fsid mappings it or does not use them it will it will continue to work just as before. Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com> --- fs/proc/base.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/fs/proc/base.c b/fs/proc/base.c index ad5f6adc9344..e085ad579604 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -2884,6 +2884,11 @@ static int proc_fsuid_map_open(struct inode *inode, struct file *file) { return proc_id_map_open(inode, file, &proc_fsuid_seq_operations); } + +static int proc_fsgid_map_open(struct inode *inode, struct file *file) +{ + return proc_id_map_open(inode, file, &proc_fsgid_seq_operations); +} #endif static const struct file_operations proc_uid_map_operations = { @@ -2918,6 +2923,14 @@ static const struct file_operations proc_fsuid_map_operations = { .llseek = seq_lseek, .release = proc_id_map_release, }; + +static const struct file_operations proc_fsgid_map_operations = { + .open = proc_fsgid_map_open, + .write = proc_fsgid_map_write, + .read = seq_read, + .llseek = seq_lseek, + .release = proc_id_map_release, +}; #endif static int proc_setgroups_open(struct inode *inode, struct file *file) @@ -3098,6 +3111,7 @@ static const struct pid_entry tgid_base_stuff[] = { #ifdef CONFIG_USER_NS #ifdef CONFIG_USER_NS_FSID REG("fsuid_map", S_IRUGO|S_IWUSR, proc_fsuid_map_operations), + REG("fsgid_map", S_IRUGO|S_IWUSR, proc_fsgid_map_operations), #endif REG("uid_map", S_IRUGO|S_IWUSR, proc_uid_map_operations), REG("gid_map", S_IRUGO|S_IWUSR, proc_gid_map_operations), -- 2.25.0
WARNING: multiple messages have this Message-ID (diff)
From: Christian Brauner <christian.brauner-GeWIH/nMZzLQT0dZR+AlfA@public.gmane.org> To: "Stéphane Graber" <stgraber-GeWIH/nMZzLQT0dZR+AlfA@public.gmane.org>, "Eric W. Biederman" <ebiederm-aS9lmoZGLiVWk0Htik3J/w@public.gmane.org>, "Aleksa Sarai" <cyphar-gVpy/LI/lHzQT0dZR+AlfA@public.gmane.org>, "Jann Horn" <jannh-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org> Cc: smbarber-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org, Alexander Viro <viro-RmSDqhL/yNMiFSDQTTA3OLVCufUGDwFn@public.gmane.org>, Alexey Dobriyan <adobriyan-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, Serge Hallyn <serge-A9i7LUbDfNHQT0dZR+AlfA@public.gmane.org>, James Morris <jmorris-gx6/JNMH7DfYtjvyW6yDsg@public.gmane.org>, Kees Cook <keescook-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>, Jonathan Corbet <corbet-T1hC0tSOHrs@public.gmane.org>, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, containers-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org, linux-security-module-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-api-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Christian Brauner <christian.brauner-GeWIH/nMZzLQT0dZR+AlfA@public.gmane.org> Subject: [PATCH 03/24] proc: add /proc/<pid>/fsgid_map Date: Tue, 11 Feb 2020 17:57:32 +0100 [thread overview] Message-ID: <20200211165753.356508-4-christian.brauner@ubuntu.com> (raw) In-Reply-To: <20200211165753.356508-1-christian.brauner-GeWIH/nMZzLQT0dZR+AlfA@public.gmane.org> The /proc/<pid>/fsgid_map file can be written to once to setup an fsgid mapping for a user namespace. Writing to this file has the same restrictions as writing to /proc/<pid>/fsgid_map. root@e1-vm:/# cat /proc/13023/fsgid_map 0 300000 100000 Fsid mappings have always been around. They are currently always identical to the id mappings for a user namespace. This means, currently whenever an fsid needs to be looked up the kernel will use the id mapping of the user namespace. With the introduction of fsid mappings the kernel will now lookup fsids in the fsid mappings of the user namespace. If no fsid mapping exists the kernel will continue looking up fsids in the id mappings of the user namespace. Hence, if a system supports fsid mappings through /proc/<pid>/fs*id_map and a container runtime is not aware of fsid mappings it or does not use them it will it will continue to work just as before. Signed-off-by: Christian Brauner <christian.brauner-GeWIH/nMZzLQT0dZR+AlfA@public.gmane.org> --- fs/proc/base.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/fs/proc/base.c b/fs/proc/base.c index ad5f6adc9344..e085ad579604 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -2884,6 +2884,11 @@ static int proc_fsuid_map_open(struct inode *inode, struct file *file) { return proc_id_map_open(inode, file, &proc_fsuid_seq_operations); } + +static int proc_fsgid_map_open(struct inode *inode, struct file *file) +{ + return proc_id_map_open(inode, file, &proc_fsgid_seq_operations); +} #endif static const struct file_operations proc_uid_map_operations = { @@ -2918,6 +2923,14 @@ static const struct file_operations proc_fsuid_map_operations = { .llseek = seq_lseek, .release = proc_id_map_release, }; + +static const struct file_operations proc_fsgid_map_operations = { + .open = proc_fsgid_map_open, + .write = proc_fsgid_map_write, + .read = seq_read, + .llseek = seq_lseek, + .release = proc_id_map_release, +}; #endif static int proc_setgroups_open(struct inode *inode, struct file *file) @@ -3098,6 +3111,7 @@ static const struct pid_entry tgid_base_stuff[] = { #ifdef CONFIG_USER_NS #ifdef CONFIG_USER_NS_FSID REG("fsuid_map", S_IRUGO|S_IWUSR, proc_fsuid_map_operations), + REG("fsgid_map", S_IRUGO|S_IWUSR, proc_fsgid_map_operations), #endif REG("uid_map", S_IRUGO|S_IWUSR, proc_uid_map_operations), REG("gid_map", S_IRUGO|S_IWUSR, proc_gid_map_operations), -- 2.25.0
next prev parent reply other threads:[~2020-02-11 17:01 UTC|newest] Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-02-11 16:57 [PATCH 00/24] user_namespace: introduce fsid mappings Christian Brauner 2020-02-11 16:57 ` [PATCH 01/24] user_namespace: introduce fsid mappings infrastructure Christian Brauner 2020-02-11 17:26 ` Randy Dunlap 2020-02-11 16:57 ` [PATCH 02/24] proc: add /proc/<pid>/fsuid_map Christian Brauner 2020-02-11 16:57 ` Christian Brauner [this message] 2020-02-11 16:57 ` [PATCH 03/24] proc: add /proc/<pid>/fsgid_map Christian Brauner 2020-02-11 16:57 ` [PATCH 04/24] fsuidgid: add fsid mapping helpers Christian Brauner 2020-02-11 16:57 ` [PATCH 05/24] proc: task_state(): use from_kfs{g,u}id_munged Christian Brauner 2020-02-11 16:57 ` [PATCH 06/24] fs: add is_userns_visible() helper Christian Brauner 2020-02-11 16:57 ` [PATCH 07/24] namei: may_{o_}create(): handle fsid mappings Christian Brauner 2020-02-11 16:57 ` [PATCH 08/24] inode: inode_owner_or_capable(): " Christian Brauner 2020-02-11 16:57 ` [PATCH 09/24] capability: privileged_wrt_inode_uidgid(): " Christian Brauner 2020-02-11 16:57 ` [PATCH 10/24] stat: " Christian Brauner 2020-02-11 16:57 ` [PATCH 11/24] open: chown_common(): " Christian Brauner 2020-02-11 16:57 ` [PATCH 12/24] posix_acl: " Christian Brauner 2020-02-11 16:57 ` [PATCH 13/24] attr: notify_change(): " Christian Brauner 2020-02-11 16:57 ` [PATCH 14/24] commoncap: cap_task_fix_setuid(): " Christian Brauner 2020-02-11 16:57 ` Christian Brauner 2020-02-11 16:57 ` [PATCH 15/24] commoncap:cap_bprm_set_creds(): " Christian Brauner 2020-02-11 16:57 ` Christian Brauner 2020-02-11 16:57 ` [PATCH 16/24] sys: __sys_setfsuid(): " Christian Brauner 2020-02-11 16:57 ` [PATCH 17/24] sys: __sys_setfsgid(): " Christian Brauner 2020-02-11 16:57 ` [PATCH 18/24] sys:__sys_setuid(): " Christian Brauner 2020-02-11 16:57 ` [PATCH 19/24] sys:__sys_setgid(): " Christian Brauner 2020-02-11 16:57 ` [PATCH 20/24] sys:__sys_setreuid(): " Christian Brauner 2020-02-11 16:57 ` [PATCH 21/24] sys:__sys_setregid(): " Christian Brauner 2020-02-11 16:57 ` Christian Brauner 2020-02-11 16:57 ` [PATCH 22/24] sys:__sys_setresuid(): " Christian Brauner 2020-02-11 16:57 ` [PATCH 23/24] sys:__sys_setresgid(): " Christian Brauner 2020-02-11 16:57 ` [PATCH 24/24] devpts: " Christian Brauner 2020-02-11 20:55 ` [PATCH 00/24] user_namespace: introduce " Jann Horn 2020-02-11 20:55 ` Jann Horn 2020-02-12 14:51 ` Christian Brauner 2020-02-12 18:53 ` Jann Horn 2020-02-12 18:53 ` Jann Horn
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200211165753.356508-4-christian.brauner@ubuntu.com \ --to=christian.brauner@ubuntu.com \ --cc=adobriyan@gmail.com \ --cc=containers@lists.linux-foundation.org \ --cc=corbet@lwn.net \ --cc=cyphar@cyphar.com \ --cc=ebiederm@xmission.com \ --cc=jannh@google.com \ --cc=jmorris@namei.org \ --cc=keescook@chromium.org \ --cc=linux-api@vger.kernel.org \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-security-module@vger.kernel.org \ --cc=serge@hallyn.com \ --cc=smbarber@chromium.org \ --cc=stgraber@ubuntu.com \ --cc=viro@zeniv.linux.org.uk \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.