Messages in this thread | | | Date | Fri, 12 Aug 2011 12:52:34 +1000 | From | Stephen Rothwell <> | Subject | Re: [PATCH 1/2] evm: building without EVM enabled fixes |
| |
Hi Mimi,
On Thu, 11 Aug 2011 00:22:51 -0400 Mimi Zohar <zohar@linux.vnet.ibm.com> wrote: > > - Missing 'inline' on evm_inode_setattr() definition. > Introduced by commit 817b54aa45db ("evm: add evm_inode_setattr to prevent > updating an invalid security.evm"). > > - Missing security_old_inode_init_security() stub function definition. > Caused by commit 9d8f13ba3f48 ("security: new security_inode_init_security > API adds function callback"). > > Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> > Signed-off-by: Mimi Zohar <zohar@us.ibm.com> > --- > include/linux/evm.h | 2 +- > include/linux/security.h | 7 +++++++ > 2 files changed, 8 insertions(+), 1 deletions(-) > > diff --git a/include/linux/evm.h b/include/linux/evm.h > index db5556d..62deb65 100644 > --- a/include/linux/evm.h > +++ b/include/linux/evm.h > @@ -45,7 +45,7 @@ static inline enum integrity_status evm_verifyxattr(struct dentry *dentry, > } > #endif > > -static int evm_inode_setattr(struct dentry *dentry, struct iattr *attr) > +static inline int evm_inode_setattr(struct dentry *dentry, struct iattr *attr) > { > return 0; > } > diff --git a/include/linux/security.h b/include/linux/security.h > index 1c528b1..f399cf1 100644 > --- a/include/linux/security.h > +++ b/include/linux/security.h > @@ -2048,6 +2048,13 @@ static inline int security_inode_init_security(struct inode *inode, > return -EOPNOTSUPP; > } > > +int security_old_inode_init_security(struct inode *inode, struct inode *dir, > + const struct qstr *qstr, char **name, > + void **value, size_t *len) > +{ > + return -EOPNOTSUPP; > +} > +
These stub functions *must* be "staic inline" (see my build report on linux-next) just like the one you fixed above.
Good plan: if you introduce a function whose existance (or behaviour) depends on a CONFIG option, then build test with and without that CONFIG option set.
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |