Re: linux-next: build failure after merge of the security tree

[Stephen Rothwell]

Hi all,

On Mon, 12 Aug 2019 10:34:17 -0700 Kees Cook <keescook@xxxxxxxxxxxx> wrote:
>
> On Mon, Aug 12, 2019 at 02:58:23PM +1000, Stephen Rothwell wrote:
> > Hi all,
> > 
> > After merging the security tree, today's linux-next build (arm
> > multi_v7_defconfig) failed like below.
> > 
> > Caused by commit
> > 
> >   45d29f9e9b8b ("security: Support early LSMs")
> > 
> > I have added the following fix for today:
> > 
> > From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> > Date: Mon, 12 Aug 2019 14:54:20 +1000
> > Subject: [PATCH] early_security_init() needs a stub got !CONFIG_SECURITY
> > 
> > An arm multi_v7_defconfig fails like this:
> > 
> > init/main.c: In function 'start_kernel':
> > init/main.c:596:2: error: implicit declaration of function 'early_security_init'; did you mean 'security_init'? [-Werror=implicit-function-declaration]
> >   early_security_init();
> >   ^~~~~~~~~~~~~~~~~~~
> >   security_init
> > 
> > Fixes: 45d29f9e9b8b ("security: Support early LSMs")
> > Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>  
> 
> Acked-by: Kees Cook <keescook@xxxxxxxxxxxx>
> 
> -Kees
> 
> > ---
> >  include/linux/security.h | 5 +++++
> >  1 file changed, 5 insertions(+)
> > 
> > diff --git a/include/linux/security.h b/include/linux/security.h
> > index 807dc0d24982..23e1c3f17d48 100644
> > --- a/include/linux/security.h
> > +++ b/include/linux/security.h
> > @@ -473,6 +473,11 @@ static inline int security_init(void)
> >  	return 0;
> >  }
> >  
> > +static inline int early_security_init(void)
> > +{
> > +	return 0;
> > +}
> > +
> >  static inline int security_binder_set_context_mgr(struct task_struct *mgr)
> >  {
> >  	return 0;
> > -- 
> > 2.20.1

I am still applying that patch ...
-- 
Cheers,
Stephen Rothwell

Attachment: pgpoQNw2fFIRV.pgp
Description: OpenPGP digital signature