From: Andreas Gruenbacher <agruenba@redhat.com> To: Jeff Layton <jlayton@redhat.com> Cc: Alexander Viro <viro@zeniv.linux.org.uk>, Christoph Hellwig <hch@infradead.org>, "Theodore Ts'o" <tytso@mit.edu>, Andreas Dilger <adilger.kernel@dilger.ca>, "J. Bruce Fields" <bfields@fieldses.org>, Trond Myklebust <trond.myklebust@primarydata.com>, Anna Schumaker <anna.schumaker@netapp.com>, Dave Chinner <david@fromorbit.com>, linux-ext4 <linux-ext4@vger.kernel.org>, XFS Developers <xfs@oss.sgi.com>, LKML <linux-kernel@vger.kernel.org>, linux-fsdevel <linux-fsdevel@vger.kernel.org>, Linux NFS Mailing List <linux-nfs@vger.kernel.org>, linux-cifs@vger.kernel.org, Linux API <linux-api@vger.kernel.org> Subject: Re: [PATCH v23 18/22] richacl: xattr mapping functions Date: Thu, 14 Jul 2016 22:33:18 +0200 [thread overview] Message-ID: <CAHc6FU4OxssRFVNwrQ+x1-C-phNF+8wgty0iZqeOYQDfTy6AyA@mail.gmail.com> (raw) In-Reply-To: <1468324965.7798.17.camel@redhat.com> On Tue, Jul 12, 2016 at 2:02 PM, Jeff Layton <jlayton@redhat.com> wrote: > On Thu, 2016-06-30 at 15:47 +0200, Andreas Gruenbacher wrote: >> Map between "system.richacl" xattrs and the in-kernel representation. >> >> Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com> >> --- >> fs/Makefile | 2 +- >> fs/richacl_xattr.c | 161 +++++++++++++++++++++++++++++++++++++ >> include/linux/richacl_xattr.h | 29 +++++++ >> include/uapi/linux/Kbuild | 1 + >> include/uapi/linux/richacl_xattr.h | 44 ++++++++++ >> include/uapi/linux/xattr.h | 2 + >> 6 files changed, 238 insertions(+), 1 deletion(-) >> create mode 100644 fs/richacl_xattr.c >> create mode 100644 include/linux/richacl_xattr.h >> create mode 100644 include/uapi/linux/richacl_xattr.h >> >> diff --git a/fs/Makefile b/fs/Makefile >> index 2b3e6f1..262fd67 100644 >> --- a/fs/Makefile >> +++ b/fs/Makefile >> @@ -49,7 +49,7 @@ obj-$(CONFIG_COREDUMP) += coredump.o >> obj-$(CONFIG_SYSCTL) += drop_caches.o >> >> obj-$(CONFIG_FHANDLE) += fhandle.o >> -obj-$(CONFIG_FS_RICHACL) += richacl.o >> +obj-$(CONFIG_FS_RICHACL) += richacl.o richacl_xattr.o >> >> obj-y += quota/ >> >> diff --git a/fs/richacl_xattr.c b/fs/richacl_xattr.c >> new file mode 100644 >> index 0000000..dc1ad36 >> --- /dev/null >> +++ b/fs/richacl_xattr.c >> @@ -0,0 +1,161 @@ >> +/* >> + * Copyright (C) 2006, 2010 Novell, Inc. >> + * Copyright (C) 2015 Red Hat, Inc. >> + * Written by Andreas Gruenbacher <agruenba@redhat.com> >> + * >> + * This program is free software; you can redistribute it and/or modify it >> + * under the terms of the GNU General Public License as published by the >> + * Free Software Foundation; either version 2, or (at your option) any >> + * later version. >> + * >> + * This program is distributed in the hope that it will be useful, but >> + * WITHOUT ANY WARRANTY; without even the implied warranty of >> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >> + * General Public License for more details. >> + */ >> + >> +#include >> +#include >> +#include >> +#include >> +#include >> + >> +/** >> + * richacl_from_xattr - convert a richacl xattr into the in-memory representation >> + */ >> +struct richacl * >> +richacl_from_xattr(struct user_namespace *user_ns, >> + const void *value, size_t size, int invalid_error) >> +{ >> + const struct richacl_xattr *xattr_acl = value; >> + const struct richace_xattr *xattr_ace = (void *)(xattr_acl + 1); >> + struct richacl *acl; >> + struct richace *ace; >> + int count; >> + >> + if (size < sizeof(*xattr_acl) || >> + xattr_acl->a_version != RICHACL_XATTR_VERSION || >> + (xattr_acl->a_flags & ~RICHACL_VALID_FLAGS)) >> + goto invalid; >> + size -= sizeof(*xattr_acl); >> + count = le16_to_cpu(xattr_acl->a_count); >> + if (count > RICHACL_XATTR_MAX_COUNT) >> + goto invalid; >> + if (size != count * sizeof(*xattr_ace)) >> + goto invalid; >> + >> + acl = richacl_alloc(count, GFP_NOFS); >> + if (!acl) >> + return ERR_PTR(-ENOMEM); >> + >> + acl->a_flags = xattr_acl->a_flags; >> + acl->a_owner_mask = le32_to_cpu(xattr_acl->a_owner_mask); >> + if (acl->a_owner_mask & ~RICHACE_VALID_MASK) >> + goto put_invalid; >> + acl->a_group_mask = le32_to_cpu(xattr_acl->a_group_mask); >> + if (acl->a_group_mask & ~RICHACE_VALID_MASK) >> + goto put_invalid; >> + acl->a_other_mask = le32_to_cpu(xattr_acl->a_other_mask); >> + if (acl->a_other_mask & ~RICHACE_VALID_MASK) >> + goto put_invalid; >> + >> + richacl_for_each_entry(ace, acl) { >> + ace->e_type = le16_to_cpu(xattr_ace->e_type); >> + ace->e_flags = le16_to_cpu(xattr_ace->e_flags); >> + ace->e_mask = le32_to_cpu(xattr_ace->e_mask); >> + >> + if (ace->e_flags & ~RICHACE_VALID_FLAGS) >> + goto put_invalid; >> + if (ace->e_flags & RICHACE_SPECIAL_WHO) { >> + ace->e_id.special = le32_to_cpu(xattr_ace->e_id); >> + if (ace->e_id.special > RICHACE_EVERYONE_SPECIAL_ID) >> + goto put_invalid; >> + } else if (ace->e_flags & RICHACE_IDENTIFIER_GROUP) { >> + u32 id = le32_to_cpu(xattr_ace->e_id); >> + >> + ace->e_id.gid = make_kgid(user_ns, id); >> + if (!gid_valid(ace->e_id.gid)) >> + goto put_invalid; >> + } else { >> + u32 id = le32_to_cpu(xattr_ace->e_id); >> + >> + ace->e_id.uid = make_kuid(user_ns, id); >> + if (!uid_valid(ace->e_id.uid)) >> + goto put_invalid; >> + } >> + if (ace->e_type > RICHACE_ACCESS_DENIED_ACE_TYPE || >> + (ace->e_mask & ~RICHACE_VALID_MASK)) >> + goto put_invalid; >> + >> + xattr_ace++; >> + } >> + >> + return acl; >> + >> +put_invalid: >> + richacl_put(acl); >> +invalid: >> + return ERR_PTR(invalid_error); >> +} >> +EXPORT_SYMBOL_GPL(richacl_from_xattr); >> + >> +/** >> + * richacl_xattr_size - compute the size of the xattr representation of @acl >> + */ >> +size_t >> +richacl_xattr_size(const struct richacl *acl) >> +{ >> + size_t size = sizeof(struct richacl_xattr); >> + >> + size += sizeof(struct richace_xattr) * acl->a_count; >> + return size; >> +} >> +EXPORT_SYMBOL_GPL(richacl_xattr_size); >> + >> +/** >> + * richacl_to_xattr - convert @acl into its xattr representation >> + * @acl: the richacl to convert >> + * @buffer: buffer for the result >> + * @size: size of @buffer >> + */ >> +int >> +richacl_to_xattr(struct user_namespace *user_ns, >> + const struct richacl *acl, void *buffer, size_t size) >> +{ >> + struct richacl_xattr *xattr_acl = buffer; >> + struct richace_xattr *xattr_ace; >> + const struct richace *ace; >> + size_t real_size; >> + >> + real_size = richacl_xattr_size(acl); >> + if (!buffer) >> + return real_size; >> + if (real_size > size) >> + return -ERANGE; >> + >> + xattr_acl->a_version = RICHACL_XATTR_VERSION; >> + xattr_acl->a_flags = acl->a_flags; >> + xattr_acl->a_count = cpu_to_le16(acl->a_count); >> + >> + xattr_acl->a_owner_mask = cpu_to_le32(acl->a_owner_mask); >> + xattr_acl->a_group_mask = cpu_to_le32(acl->a_group_mask); >> + xattr_acl->a_other_mask = cpu_to_le32(acl->a_other_mask); >> + >> + xattr_ace = (void *)(xattr_acl + 1); >> + richacl_for_each_entry(ace, acl) { >> + xattr_ace->e_type = cpu_to_le16(ace->e_type); >> + xattr_ace->e_flags = cpu_to_le16(ace->e_flags); >> + xattr_ace->e_mask = cpu_to_le32(ace->e_mask); >> + if (ace->e_flags & RICHACE_SPECIAL_WHO) >> + xattr_ace->e_id = cpu_to_le32(ace->e_id.special); >> + else if (ace->e_flags & RICHACE_IDENTIFIER_GROUP) >> + xattr_ace->e_id = >> + cpu_to_le32(from_kgid(user_ns, ace->e_id.gid)); >> + else >> + xattr_ace->e_id = >> + cpu_to_le32(from_kuid(user_ns, ace->e_id.uid)); >> + xattr_ace++; >> + } >> + return real_size; >> +} >> +EXPORT_SYMBOL_GPL(richacl_to_xattr); >> diff --git a/include/linux/richacl_xattr.h b/include/linux/richacl_xattr.h >> new file mode 100644 >> index 0000000..0efa14b >> --- /dev/null >> +++ b/include/linux/richacl_xattr.h >> @@ -0,0 +1,29 @@ >> +/* >> + * Copyright (C) 2006, 2010 Novell, Inc. >> + * Copyright (C) 2015 Red Hat, Inc. >> + * Written by Andreas Gruenbacher <agruenba@redhat.com> >> + * >> + * This program is free software; you can redistribute it and/or modify it >> + * under the terms of the GNU General Public License as published by the >> + * Free Software Foundation; either version 2, or (at your option) any >> + * later version. >> + * >> + * This program is distributed in the hope that it will be useful, but >> + * WITHOUT ANY WARRANTY; without even the implied warranty of >> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >> + * General Public License for more details. >> + */ >> + >> +#ifndef __RICHACL_XATTR_H >> +#define __RICHACL_XATTR_H >> + >> +#include >> +#include >> + >> +extern struct richacl *richacl_from_xattr(struct user_namespace *, const void *, >> + size_t, int); >> +extern size_t richacl_xattr_size(const struct richacl *); >> +extern int richacl_to_xattr(struct user_namespace *, const struct richacl *, >> + void *, size_t); >> + >> +#endif /* __RICHACL_XATTR_H */ >> diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild >> index abeaa98..c24e106 100644 >> --- a/include/uapi/linux/Kbuild >> +++ b/include/uapi/linux/Kbuild >> @@ -356,6 +356,7 @@ header-y += reiserfs_fs.h >> header-y += reiserfs_xattr.h >> header-y += resource.h >> header-y += richacl.h >> +header-y += richacl_xattr.h >> header-y += rfkill.h >> header-y += rio_mport_cdev.h >> header-y += romfs_fs.h >> diff --git a/include/uapi/linux/richacl_xattr.h b/include/uapi/linux/richacl_xattr.h >> new file mode 100644 >> index 0000000..20da204 >> --- /dev/null >> +++ b/include/uapi/linux/richacl_xattr.h >> @@ -0,0 +1,44 @@ >> +/* >> + * Copyright (C) 2006, 2010 Novell, Inc. >> + * Copyright (C) 2015 Red Hat, Inc. >> + * Written by Andreas Gruenbacher <agruenba@redhat.com> >> + * >> + * This file is free software; you can redistribute it and/or >> + * modify it under the terms of the GNU Lesser General Public >> + * License as published by the Free Software Foundation; either >> + * version 2.1 of the License, or (at your option) any later version. >> + * >> + * This file is distributed in the hope that it will be useful, >> + * but WITHOUT ANY WARRANTY; without even the implied warranty of >> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >> + * Lesser General Public License for more details. >> + */ >> + >> +#ifndef __UAPI_RICHACL_XATTR_H >> +#define __UAPI_RICHACL_XATTR_H >> + >> +#include >> +#include >> + >> +struct richace_xattr { >> + __le16 e_type; >> + __le16 e_flags; >> + __le32 e_mask; >> + __le32 e_id; >> +}; >> + >> +struct richacl_xattr { >> + __u8 a_version; >> + __u8 a_flags; >> + __le16 a_count; >> + __le32 a_owner_mask; >> + __le32 a_group_mask; >> + __le32 a_other_mask; >> +}; >> + >> +#define RICHACL_XATTR_VERSION 0 >> +#define RICHACL_XATTR_MAX_COUNT \ >> + ((XATTR_SIZE_MAX - sizeof(struct richacl_xattr)) / \ >> + sizeof(struct richace_xattr)) >> + >> +#endif /* __UAPI_RICHACL_XATTR_H */ >> diff --git a/include/uapi/linux/xattr.h b/include/uapi/linux/xattr.h >> index 1590c49..1996903 100644 >> --- a/include/uapi/linux/xattr.h >> +++ b/include/uapi/linux/xattr.h >> @@ -73,5 +73,7 @@ >> #define XATTR_POSIX_ACL_DEFAULT "posix_acl_default" >> #define XATTR_NAME_POSIX_ACL_DEFAULT XATTR_SYSTEM_PREFIX XATTR_POSIX_ACL_DEFAULT >> >> +#define XATTR_RICHACL "richacl" >> +#define XATTR_NAME_RICHACL XATTR_SYSTEM_PREFIX XATTR_RICHACL >> >> #endif /* _UAPI_LINUX_XATTR_H */ > > Fair enough. I do wonder a bit whether we might be better served with a > new set of syscalls for this instead of using xattrs (as I think > Christoph has suggested). What _is_ the rationale for doing this with > xattrs, btw? Xattrs are intended for exactly this kind of auxiliary file information. They are used for POSIX ACLs as well, and they are not going to go away. A number of utilities now include support for xattrs. By using xattrs for Richacls, those tools will automatically have at least basic Richacl support (for backup/restore and similar purposes, for example). In the kernel, supporting a new set of xattrs is pretty cheap and easy. So I really don't see the point of inventing yet another interface for basically the same type of information. > Regardless, this patch looks fine to me, assuming that we really do > want to do this xattrs: > > Reviewed-by: Jeff Layton <jlayton@redhat.com> Thanks, Andreas
WARNING: multiple messages have this Message-ID (diff)
From: Andreas Gruenbacher <agruenba@redhat.com> To: Jeff Layton <jlayton@redhat.com> Cc: "J. Bruce Fields" <bfields@fieldses.org>, Linux NFS Mailing List <linux-nfs@vger.kernel.org>, Theodore Ts'o <tytso@mit.edu>, linux-cifs@vger.kernel.org, Linux API <linux-api@vger.kernel.org>, Trond Myklebust <trond.myklebust@primarydata.com>, LKML <linux-kernel@vger.kernel.org>, XFS Developers <xfs@oss.sgi.com>, Christoph Hellwig <hch@infradead.org>, Andreas Dilger <adilger.kernel@dilger.ca>, Alexander Viro <viro@zeniv.linux.org.uk>, linux-fsdevel <linux-fsdevel@vger.kernel.org>, linux-ext4 <linux-ext4@vger.kernel.org>, Anna Schumaker <anna.schumaker@netapp.com> Subject: Re: [PATCH v23 18/22] richacl: xattr mapping functions Date: Thu, 14 Jul 2016 22:33:18 +0200 [thread overview] Message-ID: <CAHc6FU4OxssRFVNwrQ+x1-C-phNF+8wgty0iZqeOYQDfTy6AyA@mail.gmail.com> (raw) In-Reply-To: <1468324965.7798.17.camel@redhat.com> On Tue, Jul 12, 2016 at 2:02 PM, Jeff Layton <jlayton@redhat.com> wrote: > On Thu, 2016-06-30 at 15:47 +0200, Andreas Gruenbacher wrote: >> Map between "system.richacl" xattrs and the in-kernel representation. >> >> Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com> >> --- >> fs/Makefile | 2 +- >> fs/richacl_xattr.c | 161 +++++++++++++++++++++++++++++++++++++ >> include/linux/richacl_xattr.h | 29 +++++++ >> include/uapi/linux/Kbuild | 1 + >> include/uapi/linux/richacl_xattr.h | 44 ++++++++++ >> include/uapi/linux/xattr.h | 2 + >> 6 files changed, 238 insertions(+), 1 deletion(-) >> create mode 100644 fs/richacl_xattr.c >> create mode 100644 include/linux/richacl_xattr.h >> create mode 100644 include/uapi/linux/richacl_xattr.h >> >> diff --git a/fs/Makefile b/fs/Makefile >> index 2b3e6f1..262fd67 100644 >> --- a/fs/Makefile >> +++ b/fs/Makefile >> @@ -49,7 +49,7 @@ obj-$(CONFIG_COREDUMP) += coredump.o >> obj-$(CONFIG_SYSCTL) += drop_caches.o >> >> obj-$(CONFIG_FHANDLE) += fhandle.o >> -obj-$(CONFIG_FS_RICHACL) += richacl.o >> +obj-$(CONFIG_FS_RICHACL) += richacl.o richacl_xattr.o >> >> obj-y += quota/ >> >> diff --git a/fs/richacl_xattr.c b/fs/richacl_xattr.c >> new file mode 100644 >> index 0000000..dc1ad36 >> --- /dev/null >> +++ b/fs/richacl_xattr.c >> @@ -0,0 +1,161 @@ >> +/* >> + * Copyright (C) 2006, 2010 Novell, Inc. >> + * Copyright (C) 2015 Red Hat, Inc. >> + * Written by Andreas Gruenbacher <agruenba@redhat.com> >> + * >> + * This program is free software; you can redistribute it and/or modify it >> + * under the terms of the GNU General Public License as published by the >> + * Free Software Foundation; either version 2, or (at your option) any >> + * later version. >> + * >> + * This program is distributed in the hope that it will be useful, but >> + * WITHOUT ANY WARRANTY; without even the implied warranty of >> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >> + * General Public License for more details. >> + */ >> + >> +#include >> +#include >> +#include >> +#include >> +#include >> + >> +/** >> + * richacl_from_xattr - convert a richacl xattr into the in-memory representation >> + */ >> +struct richacl * >> +richacl_from_xattr(struct user_namespace *user_ns, >> + const void *value, size_t size, int invalid_error) >> +{ >> + const struct richacl_xattr *xattr_acl = value; >> + const struct richace_xattr *xattr_ace = (void *)(xattr_acl + 1); >> + struct richacl *acl; >> + struct richace *ace; >> + int count; >> + >> + if (size < sizeof(*xattr_acl) || >> + xattr_acl->a_version != RICHACL_XATTR_VERSION || >> + (xattr_acl->a_flags & ~RICHACL_VALID_FLAGS)) >> + goto invalid; >> + size -= sizeof(*xattr_acl); >> + count = le16_to_cpu(xattr_acl->a_count); >> + if (count > RICHACL_XATTR_MAX_COUNT) >> + goto invalid; >> + if (size != count * sizeof(*xattr_ace)) >> + goto invalid; >> + >> + acl = richacl_alloc(count, GFP_NOFS); >> + if (!acl) >> + return ERR_PTR(-ENOMEM); >> + >> + acl->a_flags = xattr_acl->a_flags; >> + acl->a_owner_mask = le32_to_cpu(xattr_acl->a_owner_mask); >> + if (acl->a_owner_mask & ~RICHACE_VALID_MASK) >> + goto put_invalid; >> + acl->a_group_mask = le32_to_cpu(xattr_acl->a_group_mask); >> + if (acl->a_group_mask & ~RICHACE_VALID_MASK) >> + goto put_invalid; >> + acl->a_other_mask = le32_to_cpu(xattr_acl->a_other_mask); >> + if (acl->a_other_mask & ~RICHACE_VALID_MASK) >> + goto put_invalid; >> + >> + richacl_for_each_entry(ace, acl) { >> + ace->e_type = le16_to_cpu(xattr_ace->e_type); >> + ace->e_flags = le16_to_cpu(xattr_ace->e_flags); >> + ace->e_mask = le32_to_cpu(xattr_ace->e_mask); >> + >> + if (ace->e_flags & ~RICHACE_VALID_FLAGS) >> + goto put_invalid; >> + if (ace->e_flags & RICHACE_SPECIAL_WHO) { >> + ace->e_id.special = le32_to_cpu(xattr_ace->e_id); >> + if (ace->e_id.special > RICHACE_EVERYONE_SPECIAL_ID) >> + goto put_invalid; >> + } else if (ace->e_flags & RICHACE_IDENTIFIER_GROUP) { >> + u32 id = le32_to_cpu(xattr_ace->e_id); >> + >> + ace->e_id.gid = make_kgid(user_ns, id); >> + if (!gid_valid(ace->e_id.gid)) >> + goto put_invalid; >> + } else { >> + u32 id = le32_to_cpu(xattr_ace->e_id); >> + >> + ace->e_id.uid = make_kuid(user_ns, id); >> + if (!uid_valid(ace->e_id.uid)) >> + goto put_invalid; >> + } >> + if (ace->e_type > RICHACE_ACCESS_DENIED_ACE_TYPE || >> + (ace->e_mask & ~RICHACE_VALID_MASK)) >> + goto put_invalid; >> + >> + xattr_ace++; >> + } >> + >> + return acl; >> + >> +put_invalid: >> + richacl_put(acl); >> +invalid: >> + return ERR_PTR(invalid_error); >> +} >> +EXPORT_SYMBOL_GPL(richacl_from_xattr); >> + >> +/** >> + * richacl_xattr_size - compute the size of the xattr representation of @acl >> + */ >> +size_t >> +richacl_xattr_size(const struct richacl *acl) >> +{ >> + size_t size = sizeof(struct richacl_xattr); >> + >> + size += sizeof(struct richace_xattr) * acl->a_count; >> + return size; >> +} >> +EXPORT_SYMBOL_GPL(richacl_xattr_size); >> + >> +/** >> + * richacl_to_xattr - convert @acl into its xattr representation >> + * @acl: the richacl to convert >> + * @buffer: buffer for the result >> + * @size: size of @buffer >> + */ >> +int >> +richacl_to_xattr(struct user_namespace *user_ns, >> + const struct richacl *acl, void *buffer, size_t size) >> +{ >> + struct richacl_xattr *xattr_acl = buffer; >> + struct richace_xattr *xattr_ace; >> + const struct richace *ace; >> + size_t real_size; >> + >> + real_size = richacl_xattr_size(acl); >> + if (!buffer) >> + return real_size; >> + if (real_size > size) >> + return -ERANGE; >> + >> + xattr_acl->a_version = RICHACL_XATTR_VERSION; >> + xattr_acl->a_flags = acl->a_flags; >> + xattr_acl->a_count = cpu_to_le16(acl->a_count); >> + >> + xattr_acl->a_owner_mask = cpu_to_le32(acl->a_owner_mask); >> + xattr_acl->a_group_mask = cpu_to_le32(acl->a_group_mask); >> + xattr_acl->a_other_mask = cpu_to_le32(acl->a_other_mask); >> + >> + xattr_ace = (void *)(xattr_acl + 1); >> + richacl_for_each_entry(ace, acl) { >> + xattr_ace->e_type = cpu_to_le16(ace->e_type); >> + xattr_ace->e_flags = cpu_to_le16(ace->e_flags); >> + xattr_ace->e_mask = cpu_to_le32(ace->e_mask); >> + if (ace->e_flags & RICHACE_SPECIAL_WHO) >> + xattr_ace->e_id = cpu_to_le32(ace->e_id.special); >> + else if (ace->e_flags & RICHACE_IDENTIFIER_GROUP) >> + xattr_ace->e_id = >> + cpu_to_le32(from_kgid(user_ns, ace->e_id.gid)); >> + else >> + xattr_ace->e_id = >> + cpu_to_le32(from_kuid(user_ns, ace->e_id.uid)); >> + xattr_ace++; >> + } >> + return real_size; >> +} >> +EXPORT_SYMBOL_GPL(richacl_to_xattr); >> diff --git a/include/linux/richacl_xattr.h b/include/linux/richacl_xattr.h >> new file mode 100644 >> index 0000000..0efa14b >> --- /dev/null >> +++ b/include/linux/richacl_xattr.h >> @@ -0,0 +1,29 @@ >> +/* >> + * Copyright (C) 2006, 2010 Novell, Inc. >> + * Copyright (C) 2015 Red Hat, Inc. >> + * Written by Andreas Gruenbacher <agruenba@redhat.com> >> + * >> + * This program is free software; you can redistribute it and/or modify it >> + * under the terms of the GNU General Public License as published by the >> + * Free Software Foundation; either version 2, or (at your option) any >> + * later version. >> + * >> + * This program is distributed in the hope that it will be useful, but >> + * WITHOUT ANY WARRANTY; without even the implied warranty of >> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >> + * General Public License for more details. >> + */ >> + >> +#ifndef __RICHACL_XATTR_H >> +#define __RICHACL_XATTR_H >> + >> +#include >> +#include >> + >> +extern struct richacl *richacl_from_xattr(struct user_namespace *, const void *, >> + size_t, int); >> +extern size_t richacl_xattr_size(const struct richacl *); >> +extern int richacl_to_xattr(struct user_namespace *, const struct richacl *, >> + void *, size_t); >> + >> +#endif /* __RICHACL_XATTR_H */ >> diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild >> index abeaa98..c24e106 100644 >> --- a/include/uapi/linux/Kbuild >> +++ b/include/uapi/linux/Kbuild >> @@ -356,6 +356,7 @@ header-y += reiserfs_fs.h >> header-y += reiserfs_xattr.h >> header-y += resource.h >> header-y += richacl.h >> +header-y += richacl_xattr.h >> header-y += rfkill.h >> header-y += rio_mport_cdev.h >> header-y += romfs_fs.h >> diff --git a/include/uapi/linux/richacl_xattr.h b/include/uapi/linux/richacl_xattr.h >> new file mode 100644 >> index 0000000..20da204 >> --- /dev/null >> +++ b/include/uapi/linux/richacl_xattr.h >> @@ -0,0 +1,44 @@ >> +/* >> + * Copyright (C) 2006, 2010 Novell, Inc. >> + * Copyright (C) 2015 Red Hat, Inc. >> + * Written by Andreas Gruenbacher <agruenba@redhat.com> >> + * >> + * This file is free software; you can redistribute it and/or >> + * modify it under the terms of the GNU Lesser General Public >> + * License as published by the Free Software Foundation; either >> + * version 2.1 of the License, or (at your option) any later version. >> + * >> + * This file is distributed in the hope that it will be useful, >> + * but WITHOUT ANY WARRANTY; without even the implied warranty of >> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >> + * Lesser General Public License for more details. >> + */ >> + >> +#ifndef __UAPI_RICHACL_XATTR_H >> +#define __UAPI_RICHACL_XATTR_H >> + >> +#include >> +#include >> + >> +struct richace_xattr { >> + __le16 e_type; >> + __le16 e_flags; >> + __le32 e_mask; >> + __le32 e_id; >> +}; >> + >> +struct richacl_xattr { >> + __u8 a_version; >> + __u8 a_flags; >> + __le16 a_count; >> + __le32 a_owner_mask; >> + __le32 a_group_mask; >> + __le32 a_other_mask; >> +}; >> + >> +#define RICHACL_XATTR_VERSION 0 >> +#define RICHACL_XATTR_MAX_COUNT \ >> + ((XATTR_SIZE_MAX - sizeof(struct richacl_xattr)) / \ >> + sizeof(struct richace_xattr)) >> + >> +#endif /* __UAPI_RICHACL_XATTR_H */ >> diff --git a/include/uapi/linux/xattr.h b/include/uapi/linux/xattr.h >> index 1590c49..1996903 100644 >> --- a/include/uapi/linux/xattr.h >> +++ b/include/uapi/linux/xattr.h >> @@ -73,5 +73,7 @@ >> #define XATTR_POSIX_ACL_DEFAULT "posix_acl_default" >> #define XATTR_NAME_POSIX_ACL_DEFAULT XATTR_SYSTEM_PREFIX XATTR_POSIX_ACL_DEFAULT >> >> +#define XATTR_RICHACL "richacl" >> +#define XATTR_NAME_RICHACL XATTR_SYSTEM_PREFIX XATTR_RICHACL >> >> #endif /* _UAPI_LINUX_XATTR_H */ > > Fair enough. I do wonder a bit whether we might be better served with a > new set of syscalls for this instead of using xattrs (as I think > Christoph has suggested). What _is_ the rationale for doing this with > xattrs, btw? Xattrs are intended for exactly this kind of auxiliary file information. They are used for POSIX ACLs as well, and they are not going to go away. A number of utilities now include support for xattrs. By using xattrs for Richacls, those tools will automatically have at least basic Richacl support (for backup/restore and similar purposes, for example). In the kernel, supporting a new set of xattrs is pretty cheap and easy. So I really don't see the point of inventing yet another interface for basically the same type of information. > Regardless, this patch looks fine to me, assuming that we really do > want to do this xattrs: > > Reviewed-by: Jeff Layton <jlayton@redhat.com> Thanks, Andreas _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs
next prev parent reply other threads:[~2016-07-14 20:33 UTC|newest] Thread overview: 133+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-06-30 13:46 [PATCH v23 00/22] Richacls (Core and Ext4) Andreas Gruenbacher 2016-06-30 13:46 ` Andreas Gruenbacher 2016-06-30 13:46 ` [PATCH v23 01/22] vfs: Add IS_ACL() and IS_RICHACL() tests Andreas Gruenbacher 2016-06-30 13:46 ` Andreas Gruenbacher 2016-07-05 11:00 ` Jeff Layton 2016-07-05 11:00 ` Jeff Layton 2016-06-30 13:46 ` [PATCH v23 02/22] vfs: Add MAY_CREATE_FILE and MAY_CREATE_DIR permission flags Andreas Gruenbacher 2016-06-30 13:46 ` Andreas Gruenbacher [not found] ` <1467294433-3222-3-git-send-email-agruenba-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> 2016-07-05 11:02 ` Jeff Layton 2016-07-05 11:02 ` Jeff Layton 2016-07-05 11:02 ` Jeff Layton 2016-06-30 13:46 ` [PATCH v23 03/22] vfs: Add MAY_DELETE_SELF and MAY_DELETE_CHILD " Andreas Gruenbacher 2016-06-30 13:46 ` Andreas Gruenbacher [not found] ` <1467294433-3222-4-git-send-email-agruenba-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> 2016-07-05 11:07 ` Jeff Layton 2016-07-05 11:07 ` Jeff Layton 2016-07-05 11:07 ` Jeff Layton 2016-06-30 13:46 ` [PATCH v23 04/22] vfs: Make the inode passed to inode_change_ok non-const Andreas Gruenbacher 2016-06-30 13:46 ` Andreas Gruenbacher [not found] ` <1467294433-3222-5-git-send-email-agruenba-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> 2016-07-05 11:12 ` Jeff Layton 2016-07-05 11:12 ` Jeff Layton 2016-07-05 11:12 ` Jeff Layton 2016-06-30 13:46 ` [PATCH v23 05/22] vfs: Add permission flags for setting file attributes Andreas Gruenbacher 2016-06-30 13:46 ` Andreas Gruenbacher 2016-07-05 11:18 ` Jeff Layton 2016-07-05 11:18 ` Jeff Layton 2016-06-30 13:46 ` [PATCH v23 06/22] richacl: In-memory representation and helper functions Andreas Gruenbacher 2016-06-30 13:46 ` Andreas Gruenbacher 2016-07-05 11:34 ` Jeff Layton 2016-07-05 11:34 ` Jeff Layton 2016-07-05 11:34 ` Jeff Layton [not found] ` <1467718448.3800.16.camel-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> 2016-07-11 10:11 ` Andreas Gruenbacher 2016-07-11 10:11 ` Andreas Gruenbacher 2016-07-11 10:11 ` Andreas Gruenbacher 2016-06-30 13:46 ` [PATCH v23 07/22] richacl: Permission mapping functions Andreas Gruenbacher 2016-06-30 13:46 ` Andreas Gruenbacher 2016-07-05 13:39 ` Jeff Layton 2016-07-05 13:39 ` Jeff Layton 2016-07-05 13:39 ` Jeff Layton 2016-07-11 13:26 ` Andreas Gruenbacher 2016-07-11 13:26 ` Andreas Gruenbacher 2016-06-30 13:46 ` [PATCH v23 08/22] richacl: Compute maximum file masks from an acl Andreas Gruenbacher 2016-06-30 13:46 ` Andreas Gruenbacher [not found] ` <1467294433-3222-9-git-send-email-agruenba-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> 2016-07-05 14:22 ` Jeff Layton 2016-07-05 14:22 ` Jeff Layton 2016-07-05 14:22 ` Jeff Layton 2016-07-05 17:08 ` Frank Filz 2016-07-05 17:08 ` Frank Filz 2016-07-05 17:08 ` Frank Filz 2016-07-13 12:34 ` Andreas Gruenbacher 2016-07-13 12:34 ` Andreas Gruenbacher 2016-07-13 19:38 ` Frank Filz 2016-07-13 19:38 ` Frank Filz 2016-07-13 19:38 ` Frank Filz 2016-06-30 13:47 ` [PATCH v23 09/22] richacl: Permission check algorithm Andreas Gruenbacher 2016-06-30 13:47 ` Andreas Gruenbacher 2016-07-05 14:59 ` Jeff Layton 2016-07-05 14:59 ` Jeff Layton 2016-07-11 13:28 ` Andreas Gruenbacher 2016-07-11 13:28 ` Andreas Gruenbacher 2016-06-30 13:47 ` [PATCH v23 10/22] posix_acl: Improve xattr fixup code Andreas Gruenbacher 2016-06-30 13:47 ` Andreas Gruenbacher [not found] ` <1467294433-3222-11-git-send-email-agruenba-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> 2016-07-05 15:38 ` Jeff Layton 2016-07-05 15:38 ` Jeff Layton 2016-07-05 15:38 ` Jeff Layton 2016-06-30 13:47 ` [PATCH v23 11/22] vfs: Cache base_acl objects in inodes Andreas Gruenbacher 2016-06-30 13:47 ` Andreas Gruenbacher [not found] ` <1467294433-3222-12-git-send-email-agruenba-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> 2016-07-05 15:56 ` Jeff Layton 2016-07-05 15:56 ` Jeff Layton 2016-07-05 15:56 ` Jeff Layton 2016-06-30 13:47 ` [PATCH v23 12/22] vfs: Add get_richacl and set_richacl inode operations Andreas Gruenbacher 2016-06-30 13:47 ` Andreas Gruenbacher [not found] ` <1467294433-3222-13-git-send-email-agruenba-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> 2016-07-06 18:31 ` Jeff Layton 2016-07-06 18:31 ` Jeff Layton 2016-07-06 18:31 ` Jeff Layton 2016-06-30 13:47 ` [PATCH v23 13/22] vfs: Cache richacl in struct inode Andreas Gruenbacher 2016-06-30 13:47 ` Andreas Gruenbacher [not found] ` <1467294433-3222-14-git-send-email-agruenba-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> 2016-07-06 18:57 ` Jeff Layton 2016-07-06 18:57 ` Jeff Layton 2016-07-06 18:57 ` Jeff Layton 2016-07-14 20:02 ` Andreas Gruenbacher 2016-07-14 20:02 ` Andreas Gruenbacher [not found] ` <1467831425.2908.16.camel-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> 2016-07-07 14:14 ` David Howells 2016-07-07 14:14 ` David Howells 2016-07-07 14:14 ` David Howells 2016-06-30 13:47 ` [PATCH v23 14/22] richacl: Update the file masks in chmod() Andreas Gruenbacher 2016-06-30 13:47 ` Andreas Gruenbacher [not found] ` <1467294433-3222-15-git-send-email-agruenba-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> 2016-07-12 11:36 ` Jeff Layton 2016-07-12 11:36 ` Jeff Layton 2016-07-12 11:36 ` Jeff Layton 2016-06-30 13:47 ` [PATCH v23 15/22] richacl: Check if an acl is equivalent to a file mode Andreas Gruenbacher 2016-06-30 13:47 ` Andreas Gruenbacher 2016-07-12 11:39 ` Jeff Layton 2016-07-12 11:39 ` Jeff Layton 2016-07-12 11:39 ` Jeff Layton 2016-06-30 13:47 ` [PATCH v23 16/22] richacl: Create-time inheritance Andreas Gruenbacher 2016-06-30 13:47 ` Andreas Gruenbacher 2016-07-12 11:41 ` Jeff Layton 2016-07-12 11:41 ` Jeff Layton 2016-06-30 13:47 ` [PATCH v23 17/22] richacl: Automatic Inheritance Andreas Gruenbacher 2016-06-30 13:47 ` Andreas Gruenbacher 2016-07-12 11:56 ` Jeff Layton 2016-07-12 11:56 ` Jeff Layton 2016-07-12 11:56 ` Jeff Layton [not found] ` <1468324560.7798.14.camel-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> 2016-07-12 19:11 ` J. Bruce Fields 2016-07-12 19:11 ` J. Bruce Fields 2016-07-12 19:11 ` J. Bruce Fields [not found] ` <20160712191142.GE449-uC3wQj2KruNg9hUCZPvPmw@public.gmane.org> 2016-07-12 20:28 ` Andreas Gruenbacher 2016-07-12 20:28 ` Andreas Gruenbacher 2016-07-12 20:28 ` Andreas Gruenbacher 2016-06-30 13:47 ` [PATCH v23 18/22] richacl: xattr mapping functions Andreas Gruenbacher 2016-06-30 13:47 ` Andreas Gruenbacher 2016-07-12 12:02 ` Jeff Layton 2016-07-12 12:02 ` Jeff Layton 2016-07-14 20:33 ` Andreas Gruenbacher [this message] 2016-07-14 20:33 ` Andreas Gruenbacher 2016-06-30 13:47 ` [PATCH v23 19/22] richacl: Add richacl xattr handler Andreas Gruenbacher 2016-06-30 13:47 ` Andreas Gruenbacher 2016-07-12 12:13 ` Jeff Layton 2016-07-12 12:13 ` Jeff Layton 2016-06-30 13:47 ` [PATCH v23 20/22] vfs: Add richacl permission checking Andreas Gruenbacher 2016-06-30 13:47 ` Andreas Gruenbacher 2016-07-12 12:13 ` Jeff Layton 2016-07-12 12:13 ` Jeff Layton 2016-07-12 12:13 ` Jeff Layton [not found] ` <1468325634.7798.24.camel-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> 2016-07-14 20:59 ` Andreas Gruenbacher 2016-07-14 20:59 ` Andreas Gruenbacher 2016-07-14 20:59 ` Andreas Gruenbacher 2016-06-30 13:47 ` [PATCH v23 21/22] ext4: Add richacl support Andreas Gruenbacher 2016-06-30 13:47 ` Andreas Gruenbacher 2016-06-30 13:47 ` [PATCH v23 22/22] ext4: Add richacl feature flag Andreas Gruenbacher 2016-06-30 13:47 ` Andreas Gruenbacher 2016-06-30 14:11 ` [PATCH v23 00/22] Richacls (Core and Ext4) Volker Lendecke 2016-06-30 14:11 ` Volker Lendecke
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=CAHc6FU4OxssRFVNwrQ+x1-C-phNF+8wgty0iZqeOYQDfTy6AyA@mail.gmail.com \ --to=agruenba@redhat.com \ --cc=adilger.kernel@dilger.ca \ --cc=anna.schumaker@netapp.com \ --cc=bfields@fieldses.org \ --cc=david@fromorbit.com \ --cc=hch@infradead.org \ --cc=jlayton@redhat.com \ --cc=linux-api@vger.kernel.org \ --cc=linux-cifs@vger.kernel.org \ --cc=linux-ext4@vger.kernel.org \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-nfs@vger.kernel.org \ --cc=trond.myklebust@primarydata.com \ --cc=tytso@mit.edu \ --cc=viro@zeniv.linux.org.uk \ --cc=xfs@oss.sgi.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.