Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935180Ab1ESWNF (ORCPT ); Thu, 19 May 2011 18:13:05 -0400 Received: from hrndva-omtalb.mail.rr.com ([71.74.56.124]:38591 "EHLO hrndva-omtalb.mail.rr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935139Ab1ESWNC (ORCPT ); Thu, 19 May 2011 18:13:02 -0400 X-Authority-Analysis: v=1.1 cv=y6zMVzRGPZqd+EkIbWgKRW0ZY5+85Abqc3bXR1aXymM= c=1 sm=0 a=wom5GMh1gUkA:10 a=F_mybiSpfNMA:10 a=Rj1_iGo3bfgA:10 a=kj9zAlcOel0A:10 a=g3F5VGk0NOMZWSIEWMgijA==:17 a=VnNF1IyMAAAA:8 a=fxJcL_dCAAAA:8 a=VwQbUJbxAAAA:8 a=W0vUJOdyAAAA:8 a=ga-IXIfovCPIgsT4c4oA:9 a=yTAhs_1f294bcsV37Y0A:7 a=CjuIK1q_8ugA:10 a=x8gzFH9gYPwA:10 a=2eKvNQJKnqYA:10 a=g3F5VGk0NOMZWSIEWMgijA==:117 X-Cloudmark-Score: 0 X-Originating-IP: 70.123.158.191 Date: Thu, 19 May 2011 17:13:01 -0500 From: "Serge E. Hallyn" To: Mimi Zohar Cc: linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, James Morris , David Safford , Andrew Morton , Greg KH , Dmitry Kasatkin , Mimi Zohar Subject: Re: [PATCH v5 06/21] security: imbed evm calls in security hooks Message-ID: <20110519221301.GB4332@mail.hallyn.com> References: <1305557115-15652-1-git-send-email-zohar@linux.vnet.ibm.com> <1305557115-15652-7-git-send-email-zohar@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1305557115-15652-7-git-send-email-zohar@linux.vnet.ibm.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 5476 Lines: 163 Quoting Mimi Zohar (zohar@linux.vnet.ibm.com): > Imbed the evm calls evm_inode_setxattr(), evm_inode_post_setxattr(), > evm_inode_removexattr() in the security hooks. evm_inode_setxattr() > protects security.evm xattr. evm_inode_post_setxattr() and > evm_inode_removexattr() updates the hmac associated with an inode. > > (Assumes an LSM module protects the setting/removing of xattr.) > > Changelog: > - Don't define evm_verifyxattr(), unless CONFIG_INTEGRITY is enabled. > - xattr_name is a 'const', value is 'void *' > > Signed-off-by: Mimi Zohar > Acked-by: Serge Hallyn Still looks good, thanks. > --- > include/linux/evm.h | 56 +++++++++++++++++++++++++++++++++++++ > security/integrity/evm/evm_main.c | 1 + > security/security.c | 16 +++++++++- > 3 files changed, 71 insertions(+), 2 deletions(-) > create mode 100644 include/linux/evm.h > > diff --git a/include/linux/evm.h b/include/linux/evm.h > new file mode 100644 > index 0000000..8b4e9e3 > --- /dev/null > +++ b/include/linux/evm.h > @@ -0,0 +1,56 @@ > +/* > + * evm.h > + * > + * Copyright (c) 2009 IBM Corporation > + * Author: Mimi Zohar > + */ > + > +#ifndef _LINUX_EVM_H > +#define _LINUX_EVM_H > + > +#include > + > +#ifdef CONFIG_EVM > +extern enum integrity_status evm_verifyxattr(struct dentry *dentry, > + const char *xattr_name, > + void *xattr_value, > + size_t xattr_value_len); > +extern int evm_inode_setxattr(struct dentry *dentry, const char *name, > + const void *value, size_t size); > +extern void evm_inode_post_setxattr(struct dentry *dentry, > + const char *xattr_name, > + const void *xattr_value, > + size_t xattr_value_len); > +extern int evm_inode_removexattr(struct dentry *dentry, const char *xattr_name); > +#else > +#ifdef CONFIG_INTEGRITY > +static inline enum integrity_status evm_verifyxattr(struct dentry *dentry, > + const char *xattr_name, > + void *xattr_value, > + size_t xattr_value_len) > +{ > + return INTEGRITY_UNKNOWN; > +} > +#endif > + > +static inline int evm_inode_setxattr(struct dentry *dentry, const char *name, > + const void *value, size_t size) > +{ > + return 0; > +} > + > +static inline void evm_inode_post_setxattr(struct dentry *dentry, > + const char *xattr_name, > + const void *xattr_value, > + size_t xattr_value_len) > +{ > + return; > +} > + > +static inline int evm_inode_removexattr(struct dentry *dentry, > + const char *xattr_name) > +{ > + return 0; > +} > +#endif /* CONFIG_EVM_H */ > +#endif /* LINUX_EVM_H */ > diff --git a/security/integrity/evm/evm_main.c b/security/integrity/evm/evm_main.c > index 42c792f..e89ceb1 100644 > --- a/security/integrity/evm/evm_main.c > +++ b/security/integrity/evm/evm_main.c > @@ -18,6 +18,7 @@ > #include > #include > #include > +#include > #include "evm.h" > > int evm_initialized; > diff --git a/security/security.c b/security/security.c > index d0c6576..635bcc9 100644 > --- a/security/security.c > +++ b/security/security.c > @@ -18,6 +18,7 @@ > #include > #include > #include > +#include > > /* Boot-time LSM user choice */ > static __initdata char chosen_lsm[SECURITY_NAME_MAX + 1] = > @@ -549,9 +550,14 @@ int security_inode_getattr(struct vfsmount *mnt, struct dentry *dentry) > int security_inode_setxattr(struct dentry *dentry, const char *name, > const void *value, size_t size, int flags) > { > + int ret; > + > if (unlikely(IS_PRIVATE(dentry->d_inode))) > return 0; > - return security_ops->inode_setxattr(dentry, name, value, size, flags); > + ret = security_ops->inode_setxattr(dentry, name, value, size, flags); > + if (ret) > + return ret; > + return evm_inode_setxattr(dentry, name, value, size); > } > > void security_inode_post_setxattr(struct dentry *dentry, const char *name, > @@ -560,6 +566,7 @@ void security_inode_post_setxattr(struct dentry *dentry, const char *name, > if (unlikely(IS_PRIVATE(dentry->d_inode))) > return; > security_ops->inode_post_setxattr(dentry, name, value, size, flags); > + evm_inode_post_setxattr(dentry, name, value, size); > } > > int security_inode_getxattr(struct dentry *dentry, const char *name) > @@ -578,9 +585,14 @@ int security_inode_listxattr(struct dentry *dentry) > > int security_inode_removexattr(struct dentry *dentry, const char *name) > { > + int ret; > + > if (unlikely(IS_PRIVATE(dentry->d_inode))) > return 0; > - return security_ops->inode_removexattr(dentry, name); > + ret = security_ops->inode_removexattr(dentry, name); > + if (ret) > + return ret; > + return evm_inode_removexattr(dentry, name); > } > > int security_inode_need_killpriv(struct dentry *dentry) > -- > 1.7.3.4 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/