From: Christian Brauner <christian.brauner@ubuntu.com> To: Christoph Hellwig <hch@lst.de> Cc: Lennart Poettering <lennart@poettering.net>, Mimi Zohar <zohar@linux.ibm.com>, David Howells <dhowells@redhat.com>, Andreas Dilger <adilger.kernel@dilger.ca>, containers@lists.linux-foundation.org, Tycho Andersen <tycho@tycho.ws>, Paul Moore <paul@paul-moore.com>, Jonathan Corbet <corbet@lwn.net>, smbarber@chromium.org, Christoph Hellwig <hch@infradead.org>, Alban Crequy <alban@kinvolk.io>, linux-ext4@vger.kernel.org, Mrunal Patel <mpatel@redhat.com>, Kees Cook <keescook@chromium.org>, Arnd Bergmann <arnd@arndb.de>, selinux@vger.kernel.org, Josh Triplett <josh@joshtriplett.org>, Seth Forshee <seth.forshee@canonical.com>, Aleksa Sarai <cyphar@cyphar.com>, Alexander Viro <viro@zeniv.linux.org.uk>, Andy Lutomirski <luto@kernel.org>, OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>, Geoffrey Thomas <geofft@ldpreload.com>, James Bottomley <James.Bottomley@hansenpartnership.com>, John Johansen <john.johansen@canonical.com>, Theodore Tso <tytso@mit.edu>, Dmitry Kasatkin <dmitry.kasatkin@gmail.com>, Stephen Smalley <stephen.smalley.work@gmail.com>, fstests@vger.kernel.org, linux-security-module@vger.kernel.org, "Eric W. Biederman" <ebiederm@xmission.com>, linux-api@vger.kernel.org, Casey Schaufler <casey@schaufler-ca.com>, linux-fsdevel@vger.kernel.org, linux-integrity@vger.kernel.org, Todd Kjos <tkjos@google.com> Subject: Re: [PATCH v3 04/38] fs: add mount_setattr() Date: Wed, 2 Dec 2020 10:57:45 +0100 [thread overview] Message-ID: <20201202095745.bhazopysyw5kbiee@wittgenstein> (raw) In-Reply-To: <20201202095547.GA6408@lst.de> On Wed, Dec 02, 2020 at 10:55:47AM +0100, Christoph Hellwig wrote: > On Wed, Dec 02, 2020 at 10:47:51AM +0100, Christoph Hellwig wrote: > > On Wed, Dec 02, 2020 at 10:42:18AM +0100, Christian Brauner wrote: > > > > > + if (upper_32_bits(attr->attr_set)) > > > > > + return -EINVAL; > > > > > + if (build_attr_flags(lower_32_bits(attr->attr_set), &kattr->attr_set)) > > > > > + return -EINVAL; > > > > > + > > > > > + if (upper_32_bits(attr->attr_clr)) > > > > > + return -EINVAL; > > > > > + if (build_attr_flags(lower_32_bits(attr->attr_clr), &kattr->attr_clr)) > > > > > + return -EINVAL; > > > > > > > > What is so magic about the upper and lower 32 bits? > > > > > > Nothing apart from the fact that they arent't currently valid. I can > > > think about reworking these lines. Or do you already have a preferred > > > way of doing this in mind? > > > > Just turn the attr_flags argument to build_attr_flags into a u64 and > > the first sanity check there will catch all invalid flags, no matter > > where they are places. That should also generate more efficient code. > > And while we're at it: the check for valid flags in the current > code is a little weird, given that build_attr_flags checks for > them, and but sys_fsmount also has its own slightly narrower checks. > > I think it might make sense to split the validity check out of > build_attr_flags. E.g. something like: Sounds good! If we make this a preparatory patch do you want to be recorded in the author field? > > static unsigned int attr_flags_to_mnt_flags(u64 attr_flags) > { > unsigned int mnt_flags = 0; > > if (attr_flags & MOUNT_ATTR_RDONLY) > mnt_flags |= MNT_READONLY; > if (attr_flags & MOUNT_ATTR_NOSUID) > mnt_flags |= MNT_NOSUID; > if (attr_flags & MOUNT_ATTR_NODEV) > mnt_flags |= MNT_NODEV; > if (attr_flags & MOUNT_ATTR_NOEXEC) > mnt_flags |= MNT_NOEXEC; > if (attr_flags & MOUNT_ATTR_NODIRATIME) > mnt_flags |= MNT_NODIRATIME; > > return mnt_flags; > } > > #define MOUNT_SETATTR_VALID_FLAGS \ > (MOUNT_ATTR_RDONLY | MOUNT_ATTR_NOSUID | MOUNT_ATTR_NODEV | \ > MOUNT_ATTR_NOEXEC | MOUNT_ATTR__ATIME | MOUNT_ATTR_NODIRATIME | \ > MOUNT_ATTR_IDMAP) > > static int build_mount_kattr(const struct mount_attr *attr, size_t usize, > struct mount_kattr *kattr, unsigned int flags) > { > ... > > if ((attr->attr_set | attr->attr_clr) & ~MOUNT_SETATTR_VALID_FLAGS) > return -EINVAL; > kattr->attr_set = attr_flags_to_mnt_flags(attr->attr_set); > kattr->attr_clr = attr_flags_to_mnt_flags(attr->attr_clr); > ... > } _______________________________________________ Containers mailing list Containers@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/containers
WARNING: multiple messages have this Message-ID (diff)
From: Christian Brauner <christian.brauner@ubuntu.com> To: Christoph Hellwig <hch@lst.de> Cc: "Alexander Viro" <viro@zeniv.linux.org.uk>, "Christoph Hellwig" <hch@infradead.org>, linux-fsdevel@vger.kernel.org, "John Johansen" <john.johansen@canonical.com>, "James Morris" <jmorris@namei.org>, "Mimi Zohar" <zohar@linux.ibm.com>, "Dmitry Kasatkin" <dmitry.kasatkin@gmail.com>, "Stephen Smalley" <stephen.smalley.work@gmail.com>, "Casey Schaufler" <casey@schaufler-ca.com>, "Arnd Bergmann" <arnd@arndb.de>, "Andreas Dilger" <adilger.kernel@dilger.ca>, "OGAWA Hirofumi" <hirofumi@mail.parknet.co.jp>, "Geoffrey Thomas" <geofft@ldpreload.com>, "Mrunal Patel" <mpatel@redhat.com>, "Josh Triplett" <josh@joshtriplett.org>, "Andy Lutomirski" <luto@kernel.org>, "Theodore Tso" <tytso@mit.edu>, "Alban Crequy" <alban@kinvolk.io>, "Tycho Andersen" <tycho@tycho.ws>, "David Howells" <dhowells@redhat.com>, "James Bottomley" <James.Bottomley@hansenpartnership.com>, "Seth Forshee" <seth.forshee@canonical.com>, "Stéphane Graber" <stgraber@ubuntu.com>, "Aleksa Sarai" <cyphar@cyphar.com>, "Lennart Poettering" <lennart@poettering.net>, "Eric W. Biederman" <ebiederm@xmission.com>, smbarber@chromium.org, "Phil Estes" <estesp@gmail.com>, "Serge Hallyn" <serge@hallyn.com>, "Kees Cook" <keescook@chromium.org>, "Todd Kjos" <tkjos@google.com>, "Paul Moore" <paul@paul-moore.com>, "Jonathan Corbet" <corbet@lwn.net>, containers@lists.linux-foundation.org, fstests@vger.kernel.org, linux-security-module@vger.kernel.org, linux-api@vger.kernel.org, linux-ext4@vger.kernel.org, linux-integrity@vger.kernel.org, selinux@vger.kernel.org Subject: Re: [PATCH v3 04/38] fs: add mount_setattr() Date: Wed, 2 Dec 2020 10:57:45 +0100 [thread overview] Message-ID: <20201202095745.bhazopysyw5kbiee@wittgenstein> (raw) In-Reply-To: <20201202095547.GA6408@lst.de> On Wed, Dec 02, 2020 at 10:55:47AM +0100, Christoph Hellwig wrote: > On Wed, Dec 02, 2020 at 10:47:51AM +0100, Christoph Hellwig wrote: > > On Wed, Dec 02, 2020 at 10:42:18AM +0100, Christian Brauner wrote: > > > > > + if (upper_32_bits(attr->attr_set)) > > > > > + return -EINVAL; > > > > > + if (build_attr_flags(lower_32_bits(attr->attr_set), &kattr->attr_set)) > > > > > + return -EINVAL; > > > > > + > > > > > + if (upper_32_bits(attr->attr_clr)) > > > > > + return -EINVAL; > > > > > + if (build_attr_flags(lower_32_bits(attr->attr_clr), &kattr->attr_clr)) > > > > > + return -EINVAL; > > > > > > > > What is so magic about the upper and lower 32 bits? > > > > > > Nothing apart from the fact that they arent't currently valid. I can > > > think about reworking these lines. Or do you already have a preferred > > > way of doing this in mind? > > > > Just turn the attr_flags argument to build_attr_flags into a u64 and > > the first sanity check there will catch all invalid flags, no matter > > where they are places. That should also generate more efficient code. > > And while we're at it: the check for valid flags in the current > code is a little weird, given that build_attr_flags checks for > them, and but sys_fsmount also has its own slightly narrower checks. > > I think it might make sense to split the validity check out of > build_attr_flags. E.g. something like: Sounds good! If we make this a preparatory patch do you want to be recorded in the author field? > > static unsigned int attr_flags_to_mnt_flags(u64 attr_flags) > { > unsigned int mnt_flags = 0; > > if (attr_flags & MOUNT_ATTR_RDONLY) > mnt_flags |= MNT_READONLY; > if (attr_flags & MOUNT_ATTR_NOSUID) > mnt_flags |= MNT_NOSUID; > if (attr_flags & MOUNT_ATTR_NODEV) > mnt_flags |= MNT_NODEV; > if (attr_flags & MOUNT_ATTR_NOEXEC) > mnt_flags |= MNT_NOEXEC; > if (attr_flags & MOUNT_ATTR_NODIRATIME) > mnt_flags |= MNT_NODIRATIME; > > return mnt_flags; > } > > #define MOUNT_SETATTR_VALID_FLAGS \ > (MOUNT_ATTR_RDONLY | MOUNT_ATTR_NOSUID | MOUNT_ATTR_NODEV | \ > MOUNT_ATTR_NOEXEC | MOUNT_ATTR__ATIME | MOUNT_ATTR_NODIRATIME | \ > MOUNT_ATTR_IDMAP) > > static int build_mount_kattr(const struct mount_attr *attr, size_t usize, > struct mount_kattr *kattr, unsigned int flags) > { > ... > > if ((attr->attr_set | attr->attr_clr) & ~MOUNT_SETATTR_VALID_FLAGS) > return -EINVAL; > kattr->attr_set = attr_flags_to_mnt_flags(attr->attr_set); > kattr->attr_clr = attr_flags_to_mnt_flags(attr->attr_clr); > ... > }
next prev parent reply other threads:[~2020-12-02 9:58 UTC|newest] Thread overview: 150+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-11-28 21:34 [PATCH v3 00/38] idmapped mounts Christian Brauner 2020-11-28 21:34 ` Christian Brauner 2020-11-28 21:34 ` [PATCH v3 01/38] namespace: take lock_mount_hash() directly when changing flags Christian Brauner 2020-11-28 21:34 ` Christian Brauner 2020-12-01 10:31 ` Christoph Hellwig 2020-12-01 10:31 ` Christoph Hellwig 2020-12-02 9:09 ` Christian Brauner 2020-12-02 9:09 ` Christian Brauner 2020-11-28 21:34 ` [PATCH v3 02/38] mount: make {lock,unlock}_mount_hash() static Christian Brauner 2020-11-28 21:34 ` Christian Brauner 2020-12-01 10:32 ` Christoph Hellwig 2020-12-01 10:32 ` Christoph Hellwig 2020-12-02 9:11 ` Christian Brauner 2020-12-02 9:11 ` Christian Brauner 2020-11-28 21:34 ` [PATCH v3 03/38] namespace: only take read lock in do_reconfigure_mnt() Christian Brauner 2020-11-28 21:34 ` Christian Brauner 2020-12-01 10:32 ` Christoph Hellwig 2020-12-01 10:32 ` Christoph Hellwig 2020-12-02 9:14 ` Christian Brauner 2020-12-02 9:14 ` Christian Brauner 2020-11-28 21:34 ` [PATCH v3 04/38] fs: add mount_setattr() Christian Brauner 2020-11-28 21:34 ` Christian Brauner 2020-12-01 10:49 ` Christoph Hellwig 2020-12-01 10:49 ` Christoph Hellwig 2020-12-02 9:42 ` Christian Brauner 2020-12-02 9:42 ` Christian Brauner 2020-12-02 9:47 ` Christoph Hellwig 2020-12-02 9:47 ` Christoph Hellwig 2020-12-02 9:55 ` Christoph Hellwig 2020-12-02 9:55 ` Christoph Hellwig 2020-12-02 9:57 ` Christian Brauner [this message] 2020-12-02 9:57 ` Christian Brauner 2020-12-02 10:01 ` Christoph Hellwig 2020-12-02 10:01 ` Christoph Hellwig 2020-11-28 21:34 ` [PATCH v3 05/38] tests: add mount_setattr() selftests Christian Brauner 2020-11-28 21:34 ` Christian Brauner 2020-11-28 21:34 ` [PATCH v3 06/38] fs: add id translation helpers Christian Brauner 2020-11-28 21:34 ` Christian Brauner 2020-12-01 10:49 ` Christoph Hellwig 2020-12-01 10:49 ` Christoph Hellwig 2020-12-02 9:16 ` Christian Brauner 2020-12-02 9:16 ` Christian Brauner 2020-11-28 21:34 ` [PATCH v3 07/38] mount: attach mappings to mounts Christian Brauner 2020-11-28 21:34 ` Christian Brauner 2020-12-01 10:50 ` Christoph Hellwig 2020-12-01 10:50 ` Christoph Hellwig 2020-12-01 13:25 ` Tycho Andersen 2020-12-01 13:25 ` Tycho Andersen 2020-12-02 9:24 ` Christian Brauner 2020-12-02 9:24 ` Christian Brauner 2020-11-28 21:34 ` [PATCH v3 08/38] capability: handle idmapped mounts Christian Brauner 2020-11-28 21:34 ` Christian Brauner 2020-11-28 22:34 ` Serge E. Hallyn 2020-11-28 22:34 ` Serge E. Hallyn 2020-11-28 21:34 ` [PATCH v3 09/38] namei: add idmapped mount aware permission helpers Christian Brauner 2020-11-28 21:34 ` Christian Brauner 2020-11-28 22:47 ` Serge E. Hallyn 2020-11-28 22:47 ` Serge E. Hallyn 2020-12-01 10:58 ` Christian Brauner 2020-12-01 10:58 ` Christian Brauner 2020-12-01 10:51 ` Christoph Hellwig 2020-12-01 10:51 ` Christoph Hellwig 2020-12-01 10:58 ` Christian Brauner 2020-12-01 10:58 ` Christian Brauner 2020-11-28 21:34 ` [PATCH v3 10/38] inode: add idmapped mount aware init and " Christian Brauner 2020-11-28 21:34 ` Christian Brauner 2020-12-01 10:51 ` Christoph Hellwig 2020-12-01 10:51 ` Christoph Hellwig 2020-12-02 9:17 ` Christian Brauner 2020-12-02 9:17 ` Christian Brauner 2020-11-28 21:35 ` [PATCH v3 11/38] attr: handle idmapped mounts Christian Brauner 2020-11-28 21:35 ` Christian Brauner 2020-11-28 21:35 ` [PATCH v3 12/38] acl: " Christian Brauner 2020-11-28 21:35 ` Christian Brauner 2020-11-28 21:35 ` [PATCH v3 13/38] xattr: " Christian Brauner 2020-11-28 21:35 ` Christian Brauner 2020-11-28 21:35 ` [PATCH v3 14/38] commoncap: " Christian Brauner 2020-11-28 21:35 ` Christian Brauner 2020-11-28 21:35 ` [PATCH v3 15/38] stat: " Christian Brauner 2020-11-28 21:35 ` Christian Brauner 2020-11-28 21:35 ` [PATCH v3 16/38] namei: handle idmapped mounts in may_*() helpers Christian Brauner 2020-11-28 21:35 ` Christian Brauner 2020-11-28 21:35 ` [PATCH v3 17/38] namei: introduce struct renamedata Christian Brauner 2020-11-28 21:35 ` Christian Brauner 2020-12-01 10:53 ` Christoph Hellwig 2020-12-01 10:53 ` Christoph Hellwig 2020-12-02 9:18 ` Christian Brauner 2020-12-02 9:18 ` Christian Brauner 2020-11-28 21:35 ` [PATCH v3 18/38] namei: prepare for idmapped mounts Christian Brauner 2020-11-28 21:35 ` Christian Brauner 2020-11-28 21:35 ` [PATCH v3 19/38] open: handle idmapped mounts in do_truncate() Christian Brauner 2020-11-28 21:35 ` Christian Brauner 2020-11-28 21:35 ` [PATCH v3 20/38] open: handle idmapped mounts Christian Brauner 2020-11-28 21:35 ` Christian Brauner 2020-11-28 21:35 ` [PATCH v3 21/38] af_unix: " Christian Brauner 2020-11-28 21:35 ` Christian Brauner 2020-11-28 21:35 ` [PATCH v3 22/38] utimes: " Christian Brauner 2020-11-28 21:35 ` Christian Brauner 2020-11-28 21:35 ` [PATCH v3 23/38] fcntl: " Christian Brauner 2020-11-28 21:35 ` Christian Brauner 2020-11-28 21:35 ` [PATCH v3 24/38] notify: " Christian Brauner 2020-11-28 21:35 ` Christian Brauner 2020-11-28 21:35 ` [PATCH v3 25/38] init: " Christian Brauner 2020-11-28 21:35 ` Christian Brauner 2020-11-28 21:35 ` [PATCH v3 26/38] ioctl: " Christian Brauner 2020-11-28 21:35 ` Christian Brauner 2020-11-28 21:35 ` [PATCH v3 27/38] would_dump: " Christian Brauner 2020-11-28 21:35 ` Christian Brauner 2020-11-28 21:35 ` [PATCH v3 28/38] exec: " Christian Brauner 2020-11-28 21:35 ` Christian Brauner 2020-11-28 21:35 ` [PATCH v3 29/38] fs: add helpers for idmap mounts Christian Brauner 2020-11-28 21:35 ` Christian Brauner 2020-11-28 21:35 ` [PATCH v3 30/38] apparmor: handle idmapped mounts Christian Brauner 2020-11-28 21:35 ` Christian Brauner 2020-11-28 21:35 ` [PATCH v3 31/38] ima: " Christian Brauner 2020-11-28 21:35 ` Christian Brauner 2020-11-28 21:35 ` [PATCH v3 32/38] fat: " Christian Brauner 2020-11-28 21:35 ` Christian Brauner 2020-11-30 22:50 ` Mauricio Vásquez Bernal 2020-11-30 22:50 ` Mauricio Vásquez Bernal 2020-12-01 10:24 ` Christian Brauner 2020-12-01 10:24 ` Christian Brauner 2020-11-28 21:35 ` [PATCH v3 33/38] ext4: support " Christian Brauner 2020-11-28 21:35 ` Christian Brauner 2020-11-30 22:52 ` Mauricio Vásquez Bernal 2020-11-30 22:52 ` Mauricio Vásquez Bernal 2020-12-01 10:28 ` Christian Brauner 2020-12-01 10:28 ` Christian Brauner 2020-12-01 10:54 ` Christoph Hellwig 2020-12-01 10:54 ` Christoph Hellwig 2020-12-01 11:02 ` Christian Brauner 2020-12-01 11:02 ` Christian Brauner 2020-12-01 11:13 ` Christoph Hellwig 2020-12-01 11:13 ` Christoph Hellwig 2020-12-01 11:14 ` Christian Brauner 2020-12-01 11:14 ` Christian Brauner 2020-11-28 21:35 ` [PATCH v3 34/38] ecryptfs: do not mount on top of " Christian Brauner 2020-11-28 21:35 ` Christian Brauner 2020-11-28 21:35 ` [PATCH v3 35/38] overlayfs: " Christian Brauner 2020-11-28 21:35 ` Christian Brauner 2020-11-28 21:35 ` [PATCH v3 36/38] fs: introduce MOUNT_ATTR_IDMAP Christian Brauner 2020-11-28 21:35 ` Christian Brauner 2020-11-28 21:35 ` [PATCH v3 37/38] tests: extend mount_setattr tests Christian Brauner 2020-11-28 21:35 ` Christian Brauner 2020-11-28 21:35 ` [PATCH v3 38/38] generic/618: add fstests for idmapped mounts Christian Brauner 2020-11-28 21:35 ` Christian Brauner 2020-11-28 22:54 ` [PATCH v3 00/38] " Serge E. Hallyn 2020-11-28 22:54 ` Serge E. Hallyn 2020-12-01 10:18 ` Christian Brauner 2020-12-01 10:18 ` Christian Brauner
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=20201202095745.bhazopysyw5kbiee@wittgenstein \ --to=christian.brauner@ubuntu.com \ --cc=James.Bottomley@hansenpartnership.com \ --cc=adilger.kernel@dilger.ca \ --cc=alban@kinvolk.io \ --cc=arnd@arndb.de \ --cc=casey@schaufler-ca.com \ --cc=containers@lists.linux-foundation.org \ --cc=corbet@lwn.net \ --cc=cyphar@cyphar.com \ --cc=dhowells@redhat.com \ --cc=dmitry.kasatkin@gmail.com \ --cc=ebiederm@xmission.com \ --cc=fstests@vger.kernel.org \ --cc=geofft@ldpreload.com \ --cc=hch@infradead.org \ --cc=hch@lst.de \ --cc=hirofumi@mail.parknet.co.jp \ --cc=john.johansen@canonical.com \ --cc=josh@joshtriplett.org \ --cc=keescook@chromium.org \ --cc=lennart@poettering.net \ --cc=linux-api@vger.kernel.org \ --cc=linux-ext4@vger.kernel.org \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-integrity@vger.kernel.org \ --cc=linux-security-module@vger.kernel.org \ --cc=luto@kernel.org \ --cc=mpatel@redhat.com \ --cc=paul@paul-moore.com \ --cc=selinux@vger.kernel.org \ --cc=seth.forshee@canonical.com \ --cc=smbarber@chromium.org \ --cc=stephen.smalley.work@gmail.com \ --cc=tkjos@google.com \ --cc=tycho@tycho.ws \ --cc=tytso@mit.edu \ --cc=viro@zeniv.linux.org.uk \ --cc=zohar@linux.ibm.com \ /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.