Message ID | 20190205085915.5183-4-omosnace@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | Allow initializing the kernfs node's secctx based on its parent | expand |
Hi Ondrej, Thank you for the patch! Yet something to improve: [auto build test ERROR on driver-core/driver-core-testing] [also build test ERROR on v5.0-rc4 next-20190205] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] url: https://github.com/0day-ci/linux/commits/Ondrej-Mosnacek/Allow-initializing-the-kernfs-node-s-secctx-based-on-its-parent/20190205-171434 config: x86_64-randconfig-x013-201905 (attached as .config) compiler: gcc-8 (Debian 8.2.0-14) 8.2.0 reproduce: # save the attached .config to linux build tree make ARCH=x86_64 All errors (new ones prefixed by >>): In file included from fs/file_table.c:15: >> include/linux/security.h:796:1: error: expected identifier or '(' before '{' token { ^ In file included from fs/file_table.c:15: include/linux/security.h:792:19: warning: 'security_kernfs_init_security' declared 'static' but never defined [-Wunused-function] static inline int security_kernfs_init_security( ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ vim +796 include/linux/security.h 791 792 static inline int security_kernfs_init_security( 793 const struct qstr *qstr, const struct iattr *dir_iattr, 794 struct simple_xattrs *dir_secattr, const struct iattr *iattr, 795 struct simple_xattrs *secattr); > 796 { 797 return 0; 798 } 799 --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation
Hi Ondrej, Thank you for the patch! Yet something to improve: [auto build test ERROR on driver-core/driver-core-testing] [also build test ERROR on v5.0-rc4 next-20190205] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] url: https://github.com/0day-ci/linux/commits/Ondrej-Mosnacek/Allow-initializing-the-kernfs-node-s-secctx-based-on-its-parent/20190205-171434 config: sparc-defconfig (attached as .config) compiler: sparc-linux-gcc (GCC) 8.2.0 reproduce: wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross # save the attached .config to linux build tree GCC_VERSION=8.2.0 make.cross ARCH=sparc All errors (new ones prefixed by >>): In file included from include/net/scm.h:8, from include/linux/netlink.h:9, from include/uapi/linux/neighbour.h:6, from include/linux/netdevice.h:50, from include/linux/etherdevice.h:26, from arch/sparc/kernel/idprom.c:13: include/linux/security.h:796:1: error: expected identifier or '(' before '{' token { ^ >> include/linux/security.h:792:19: error: 'security_kernfs_init_security' declared 'static' but never defined [-Werror=unused-function] static inline int security_kernfs_init_security( ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ cc1: all warnings being treated as errors vim +792 include/linux/security.h 791 > 792 static inline int security_kernfs_init_security( 793 const struct qstr *qstr, const struct iattr *dir_iattr, 794 struct simple_xattrs *dir_secattr, const struct iattr *iattr, 795 struct simple_xattrs *secattr); > 796 { 797 return 0; 798 } 799 --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation
On Tue, Feb 5, 2019 at 10:52 AM kbuild test robot <lkp@intel.com> wrote: > > Hi Ondrej, > > Thank you for the patch! Yet something to improve: > > [auto build test ERROR on driver-core/driver-core-testing] > [also build test ERROR on v5.0-rc4 next-20190205] > [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] > > url: https://github.com/0day-ci/linux/commits/Ondrej-Mosnacek/Allow-initializing-the-kernfs-node-s-secctx-based-on-its-parent/20190205-171434 > config: x86_64-randconfig-x013-201905 (attached as .config) > compiler: gcc-8 (Debian 8.2.0-14) 8.2.0 > reproduce: > # save the attached .config to linux build tree > make ARCH=x86_64 > > All errors (new ones prefixed by >>): > > In file included from fs/file_table.c:15: > >> include/linux/security.h:796:1: error: expected identifier or '(' before '{' token > { > ^ > In file included from fs/file_table.c:15: > include/linux/security.h:792:19: warning: 'security_kernfs_init_security' declared 'static' but never defined [-Wunused-function] > static inline int security_kernfs_init_security( > ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > > vim +796 include/linux/security.h > > 791 > 792 static inline int security_kernfs_init_security( > 793 const struct qstr *qstr, const struct iattr *dir_iattr, > 794 struct simple_xattrs *dir_secattr, const struct iattr *iattr, > 795 struct simple_xattrs *secattr); > > 796 { > 797 return 0; > 798 } > 799 *facepalm*... Fixed in v5.
diff --git a/include/linux/lsm_hooks.h b/include/linux/lsm_hooks.h index 9a0bdf91e646..558bbc0ff125 100644 --- a/include/linux/lsm_hooks.h +++ b/include/linux/lsm_hooks.h @@ -429,6 +429,21 @@ * to abort the copy up. Note that the caller is responsible for reading * and writing the xattrs as this hook is merely a filter. * + * Security hooks for kernfs node operations + * + * @kernfs_init_security + * Initialize the security context of a newlycreated kernfs node based + * on its own and its parent's attributes. The security context (or other + * LSM metadata) should be stored in @secattr as extended attributes. + * The hook MAY NOT add/modify attributes in @dir_secattr; it should be + * treated as a read-only list of attributes. + * + * @qstr contains the last path component of the new node. + * @dir_iattr contains the inode attributes of the parent node. + * @dir_secattr is the list of security xattrs of the parent node. + * @iattr contains the inode attributes of the new node. + * @secattr is the list of security xattrs of the new node. + * * Security hooks for file operations * * @file_permission: @@ -1558,6 +1573,12 @@ union security_list_options { int (*inode_copy_up)(struct dentry *src, struct cred **new); int (*inode_copy_up_xattr)(const char *name); + int (*kernfs_init_security)(const struct qstr *qstr, + const struct iattr *dir_iattr, + struct simple_xattrs *dir_secattr, + const struct iattr *iattr, + struct simple_xattrs *secattr); + int (*file_permission)(struct file *file, int mask); int (*file_alloc_security)(struct file *file); void (*file_free_security)(struct file *file); @@ -1858,6 +1879,7 @@ struct security_hook_heads { struct hlist_head inode_getsecid; struct hlist_head inode_copy_up; struct hlist_head inode_copy_up_xattr; + struct hlist_head kernfs_init_security; struct hlist_head file_permission; struct hlist_head file_alloc_security; struct hlist_head file_free_security; diff --git a/include/linux/security.h b/include/linux/security.h index dbfb5a66babb..5b2aeb2457ab 100644 --- a/include/linux/security.h +++ b/include/linux/security.h @@ -51,6 +51,7 @@ struct fown_struct; struct file_operations; struct msg_msg; struct xattr; +struct simple_xattrs; struct xfrm_sec_ctx; struct mm_struct; @@ -291,6 +292,11 @@ int security_inode_listsecurity(struct inode *inode, char *buffer, size_t buffer void security_inode_getsecid(struct inode *inode, u32 *secid); int security_inode_copy_up(struct dentry *src, struct cred **new); int security_inode_copy_up_xattr(const char *name); +int security_kernfs_init_security(const struct qstr *qstr, + const struct iattr *dir_iattr, + struct simple_xattrs *dir_secattr, + const struct iattr *iattr, + struct simple_xattrs *secattr); int security_file_permission(struct file *file, int mask); int security_file_alloc(struct file *file); void security_file_free(struct file *file); @@ -783,6 +789,14 @@ static inline int security_inode_copy_up(struct dentry *src, struct cred **new) return 0; } +static inline int security_kernfs_init_security( + const struct qstr *qstr, const struct iattr *dir_iattr, + struct simple_xattrs *dir_secattr, const struct iattr *iattr, + struct simple_xattrs *secattr); +{ + return 0; +} + static inline int security_inode_copy_up_xattr(const char *name) { return -EOPNOTSUPP; diff --git a/security/security.c b/security/security.c index f1b8d2587639..836e0822874a 100644 --- a/security/security.c +++ b/security/security.c @@ -892,6 +892,16 @@ int security_inode_copy_up_xattr(const char *name) } EXPORT_SYMBOL(security_inode_copy_up_xattr); +int security_kernfs_init_security(const struct qstr *qstr, + const struct iattr *dir_iattr, + struct simple_xattrs *dir_secattr, + const struct iattr *iattr, + struct simple_xattrs *secattr) +{ + return call_int_hook(kernfs_init_security, 0, qstr, dir_iattr, + dir_secattr, iattr, secattr); +} + int security_file_permission(struct file *file, int mask) { int ret;
This patch introduces a new security hook that is intended for initializing the security data for newly created kernfs nodes, which provide a way of storing a non-default security context, but need to operate independently from mounts (and therefore may not have an associated inode at the moment of creation). The main motivation is to allow kernfs nodes to inherit the context of the parent under SELinux, similar to the behavior of security_inode_init_security(). Other LSMs may implement their own logic for handling the creation of new nodes. The interface of the new hook provides the following to the LSM: * a qstr containing the name of the new node * inode attributes of the parent node (directory) * initial inode attributes (struct iattr + simple_xattrs) of the new node Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com> --- include/linux/lsm_hooks.h | 22 ++++++++++++++++++++++ include/linux/security.h | 14 ++++++++++++++ security/security.c | 10 ++++++++++ 3 files changed, 46 insertions(+)