2019-08-12 04:59:40

by Stephen Rothwell

[permalink] [raw]
Subject: linux-next: build failure after merge of the security tree

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 <[email protected]>
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 <[email protected]>
---
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

--
Cheers,
Stephen Rothwell


Attachments:
(No filename) (499.00 B)
OpenPGP digital signature

2019-08-12 17:46:31

by Kees Cook

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the security tree

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 <[email protected]>
> 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 <[email protected]>

Acked-by: Kees Cook <[email protected]>

-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
>
> --
> Cheers,
> Stephen Rothwell



--
Kees Cook

2019-08-19 03:22:33

by Stephen Rothwell

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the security tree

Hi all,

On Mon, 12 Aug 2019 10:34:17 -0700 Kees Cook <[email protected]> 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 <[email protected]>
> > 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 <[email protected]>
>
> Acked-by: Kees Cook <[email protected]>
>
> -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


Attachments:
(No filename) (499.00 B)
OpenPGP digital signature

2019-08-19 03:39:12

by Stephen Rothwell

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the security tree

Hi James,

On Mon, 19 Aug 2019 13:21:19 +1000 Stephen Rothwell <[email protected]> wrote:
>
> On Mon, 12 Aug 2019 10:34:17 -0700 Kees Cook <[email protected]> wrote:
> >
> > On Mon, Aug 12, 2019 at 02:58:23PM +1000, Stephen Rothwell wrote:
> > >
> > > 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 <[email protected]>
> > > Date: Mon, 12 Aug 2019 14:54:20 +1000
> > > Subject: [PATCH] early_security_init() needs a stub got !CONFIG_SECURITY
^^^
for

If you do decide to apply this patch, please fix the subject typo, thanks :-)

--
Cheers,
Stephen Rothwell


Attachments:
(No filename) (499.00 B)
OpenPGP digital signature

2019-08-21 16:41:10

by James Morris

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the security tree

On Mon, 19 Aug 2019, Stephen Rothwell wrote:

> > > 2.20.1
>
> I am still applying that patch ...
>

Matthew folded it into commit e6b1db98cf4d54d9ea59cfcc195f70dc946fdd38.


--
James Morris
<[email protected]>