Re: + headers-untangle-kmemleakh-from-mmh-fix.patch added to -mm tree

Re: + headers-untangle-kmemleakh-from-mmh-fix.patch added to -mm tree

[Michal Hocko]

On Tue 06-03-18 15:49:07, Andrew Morton wrote:
> From: Andrew Morton <akpm@linux-foundation.org>
> Subject: headers-untangle-kmemleakh-from-mmh-fix
> 
> security/keys/big_key.c needs vmalloc.h, per sfr
> 
> Cc: Randy Dunlap <rdunlap@infradead.org>
> Cc: Stephen Rothwell <sfr@canb.auug.org.au>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
> ---
> 
>  security/keys/big_key.c |    1 +
>  1 file changed, 1 insertion(+)
> 
> diff -puN security/keys/big_key.c~headers-untangle-kmemleakh-from-mmh-fix security/keys/big_key.c
> --- a/security/keys/big_key.c~headers-untangle-kmemleakh-from-mmh-fix
> +++ a/security/keys/big_key.c
> @@ -18,6 +18,7 @@
>  #include <linux/err.h>
>  #include <linux/scatterlist.h>
>  #include <linux/random.h>
> +#include <linux/vmalloc.h>
>  #include <keys/user-type.h>
>  #include <keys/big_key-type.h>
>  #include <crypto/aead.h>

My build test battery says we need also this one, m32r complains
otherwise for allmodconfig.

>From 5c3f7a041df707417532dd64b1d71fc29b24c0fe Mon Sep 17 00:00:00 2001
From: Michal Hocko <mhocko@suse.com>
Date: Wed, 14 Mar 2018 13:15:49 +0100
Subject: [PATCH] headers-untangle-kmemleakh-from-mmh-fix-fix

m32r allmodconfig complains with
security/integrity/digsig.c:146:2: error: implicit declaration of function 'vfree' [-Werror=implicit-function-declaration]
  vfree(data);
  ^
Signed-off-by: Michal Hocko <mhocko@suse.com>
---
 security/integrity/digsig.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/security/integrity/digsig.c b/security/integrity/digsig.c
index 6f9e4ce568cd..9bb0a7f2863e 100644
--- a/security/integrity/digsig.c
+++ b/security/integrity/digsig.c
@@ -18,6 +18,7 @@
 #include <linux/cred.h>
 #include <linux/key-type.h>
 #include <linux/digsig.h>
+#include <linux/vmalloc.h>
 #include <crypto/public_key.h>
 #include <keys/system_keyring.h>
 
-- 
2.16.1

-- 
Michal Hocko
SUSE Labs

Re: + headers-untangle-kmemleakh-from-mmh-fix.patch added to -mm tree

[Andrew Morton]

On Wed, 14 Mar 2018 13:17:04 +0100 Michal Hocko <mhocko@kernel.org> wrote:

> > --- a/security/keys/big_key.c~headers-untangle-kmemleakh-from-mmh-fix
> > +++ a/security/keys/big_key.c
> > @@ -18,6 +18,7 @@
> >  #include <linux/err.h>
> >  #include <linux/scatterlist.h>
> >  #include <linux/random.h>
> > +#include <linux/vmalloc.h>
> >  #include <keys/user-type.h>
> >  #include <keys/big_key-type.h>
> >  #include <crypto/aead.h>
> 
> My build test battery says we need also this one, m32r complains
> otherwise for allmodconfig.
> 
> >From 5c3f7a041df707417532dd64b1d71fc29b24c0fe Mon Sep 17 00:00:00 2001
> From: Michal Hocko <mhocko@suse.com>
> Date: Wed, 14 Mar 2018 13:15:49 +0100
> Subject: [PATCH] headers-untangle-kmemleakh-from-mmh-fix-fix
> 
> m32r allmodconfig complains with
> security/integrity/digsig.c:146:2: error: implicit declaration of function 'vfree' [-Werror=implicit-function-declaration]
>   vfree(data);
>   ^
> Signed-off-by: Michal Hocko <mhocko@suse.com>
> ---
>  security/integrity/digsig.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/security/integrity/digsig.c b/security/integrity/digsig.c
> index 6f9e4ce568cd..9bb0a7f2863e 100644
> --- a/security/integrity/digsig.c
> +++ b/security/integrity/digsig.c
> @@ -18,6 +18,7 @@
>  #include <linux/cred.h>
>  #include <linux/key-type.h>
>  #include <linux/digsig.h>
> +#include <linux/vmalloc.h>
>  #include <crypto/public_key.h>
>  #include <keys/system_keyring.h>

hm, current linux-next.patch already has this change.  What happened here?

Re: + headers-untangle-kmemleakh-from-mmh-fix.patch added to -mm tree

[Michal Hocko]

On Wed 14-03-18 07:50:55, Andrew Morton wrote:
> On Wed, 14 Mar 2018 13:17:04 +0100 Michal Hocko <mhocko@kernel.org> wrote:
> 
> > > --- a/security/keys/big_key.c~headers-untangle-kmemleakh-from-mmh-fix
> > > +++ a/security/keys/big_key.c
> > > @@ -18,6 +18,7 @@
> > >  #include <linux/err.h>
> > >  #include <linux/scatterlist.h>
> > >  #include <linux/random.h>
> > > +#include <linux/vmalloc.h>
> > >  #include <keys/user-type.h>
> > >  #include <keys/big_key-type.h>
> > >  #include <crypto/aead.h>
> > 
> > My build test battery says we need also this one, m32r complains
> > otherwise for allmodconfig.
> > 
> > >From 5c3f7a041df707417532dd64b1d71fc29b24c0fe Mon Sep 17 00:00:00 2001
> > From: Michal Hocko <mhocko@suse.com>
> > Date: Wed, 14 Mar 2018 13:15:49 +0100
> > Subject: [PATCH] headers-untangle-kmemleakh-from-mmh-fix-fix
> > 
> > m32r allmodconfig complains with
> > security/integrity/digsig.c:146:2: error: implicit declaration of function 'vfree' [-Werror=implicit-function-declaration]
> >   vfree(data);
> >   ^
> > Signed-off-by: Michal Hocko <mhocko@suse.com>
> > ---
> >  security/integrity/digsig.c | 1 +
> >  1 file changed, 1 insertion(+)
> > 
> > diff --git a/security/integrity/digsig.c b/security/integrity/digsig.c
> > index 6f9e4ce568cd..9bb0a7f2863e 100644
> > --- a/security/integrity/digsig.c
> > +++ b/security/integrity/digsig.c
> > @@ -18,6 +18,7 @@
> >  #include <linux/cred.h>
> >  #include <linux/key-type.h>
> >  #include <linux/digsig.h>
> > +#include <linux/vmalloc.h>
> >  #include <crypto/public_key.h>
> >  #include <keys/system_keyring.h>
> 
> hm, current linux-next.patch already has this change.  What happened here?

OK, I see. This is usuall inter tree mess. It didn't fly through your
tree:
commit 120f3b11ef88fc38ce1d0ff9c9a4b37860ad3140
Author: Randy Dunlap <rdunlap@infradead.org>
Date:   Mon Feb 12 17:26:20 2018 -0800

    integrity/security: fix digsig.c build error with header file
    
    security/integrity/digsig.c has build errors on some $ARCH due to a
    missing header file, so add it.
    
      security/integrity/digsig.c:146:2: error: implicit declaration of function 'vfree' [-Werror=implicit-function-declaration]
    
    Reported-by: Michael Ellerman <mpe@ellerman.id.au>
    Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
    Cc: Mimi Zohar <zohar@linux.vnet.ibm.com>
    Cc: linux-integrity@vger.kernel.org
    Link: http://kisskb.ellerman.id.au/kisskb/head/13396/
    Signed-off-by: James Morris <james.morris@microsoft.com>

And that is why I haven't noticed that.

-- 
Michal Hocko
SUSE Labs

Re: + headers-untangle-kmemleakh-from-mmh-fix.patch added to -mm tree

[Andrew Morton]

On Wed, 14 Mar 2018 15:57:24 +0100 Michal Hocko <mhocko@kernel.org> wrote:

> > >  1 file changed, 1 insertion(+)
> > > 
> > > diff --git a/security/integrity/digsig.c b/security/integrity/digsig.c
> > > index 6f9e4ce568cd..9bb0a7f2863e 100644
> > > --- a/security/integrity/digsig.c
> > > +++ b/security/integrity/digsig.c
> > > @@ -18,6 +18,7 @@
> > >  #include <linux/cred.h>
> > >  #include <linux/key-type.h>
> > >  #include <linux/digsig.h>
> > > +#include <linux/vmalloc.h>
> > >  #include <crypto/public_key.h>
> > >  #include <keys/system_keyring.h>
> > 
> > hm, current linux-next.patch already has this change.  What happened here?
> 
> OK, I see. This is usuall inter tree mess. It didn't fly through your
> tree:
> commit 120f3b11ef88fc38ce1d0ff9c9a4b37860ad3140
> Author: Randy Dunlap <rdunlap@infradead.org>
> Date:   Mon Feb 12 17:26:20 2018 -0800
> 
>     integrity/security: fix digsig.c build error with header file
>     
>     security/integrity/digsig.c has build errors on some $ARCH due to a
>     missing header file, so add it.
>     
>       security/integrity/digsig.c:146:2: error: implicit declaration of function 'vfree' [-Werror=implicit-function-declaration]
>     
>     Reported-by: Michael Ellerman <mpe@ellerman.id.au>
>     Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
>     Cc: Mimi Zohar <zohar@linux.vnet.ibm.com>
>     Cc: linux-integrity@vger.kernel.org
>     Link: http://kisskb.ellerman.id.au/kisskb/head/13396/
>     Signed-off-by: James Morris <james.morris@microsoft.com>
> 
> And that is why I haven't noticed that.

I can jiggle things to prevent this, but the
security/integrity/digsig.c fix is actually in mainline now so things
should sort themselves out OK.

Re: + headers-untangle-kmemleakh-from-mmh-fix.patch added to -mm tree

[Michal Hocko]

On Wed 14-03-18 08:03:28, Andrew Morton wrote:
> On Wed, 14 Mar 2018 15:57:24 +0100 Michal Hocko <mhocko@kernel.org> wrote:
> 
> > > >  1 file changed, 1 insertion(+)
> > > > 
> > > > diff --git a/security/integrity/digsig.c b/security/integrity/digsig.c
> > > > index 6f9e4ce568cd..9bb0a7f2863e 100644
> > > > --- a/security/integrity/digsig.c
> > > > +++ b/security/integrity/digsig.c
> > > > @@ -18,6 +18,7 @@
> > > >  #include <linux/cred.h>
> > > >  #include <linux/key-type.h>
> > > >  #include <linux/digsig.h>
> > > > +#include <linux/vmalloc.h>
> > > >  #include <crypto/public_key.h>
> > > >  #include <keys/system_keyring.h>
> > > 
> > > hm, current linux-next.patch already has this change.  What happened here?
> > 
> > OK, I see. This is usuall inter tree mess. It didn't fly through your
> > tree:
> > commit 120f3b11ef88fc38ce1d0ff9c9a4b37860ad3140
> > Author: Randy Dunlap <rdunlap@infradead.org>
> > Date:   Mon Feb 12 17:26:20 2018 -0800
> > 
> >     integrity/security: fix digsig.c build error with header file
> >     
> >     security/integrity/digsig.c has build errors on some $ARCH due to a
> >     missing header file, so add it.
> >     
> >       security/integrity/digsig.c:146:2: error: implicit declaration of function 'vfree' [-Werror=implicit-function-declaration]
> >     
> >     Reported-by: Michael Ellerman <mpe@ellerman.id.au>
> >     Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
> >     Cc: Mimi Zohar <zohar@linux.vnet.ibm.com>
> >     Cc: linux-integrity@vger.kernel.org
> >     Link: http://kisskb.ellerman.id.au/kisskb/head/13396/
> >     Signed-off-by: James Morris <james.morris@microsoft.com>
> > 
> > And that is why I haven't noticed that.
> 
> I can jiggle things to prevent this, but the
> security/integrity/digsig.c fix is actually in mainline now so things
> should sort themselves out OK.

Sure, I have done essentially the same with in my mmotm git tree.
-- 
Michal Hocko
SUSE Labs

Re: + headers-untangle-kmemleakh-from-mmh-fix.patch added to -mm tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 432 bytes --]

Hi Michal,

On Wed, 14 Mar 2018 13:17:04 +0100 Michal Hocko <mhocko@kernel.org> wrote:
>
> My build test battery says we need also this one, m32r complains
> otherwise for allmodconfig.

Note that the m32r architecture is being removed (the removal will be
in linux-next today) so you might want to remove it from your testing.

Also cris, metag, mn10300, frv, score, blackfin and tile.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: + headers-untangle-kmemleakh-from-mmh-fix.patch added to -mm tree

[Michal Hocko]

On Thu 15-03-18 08:00:01, Stephen Rothwell wrote:
> Hi Michal,
> 
> On Wed, 14 Mar 2018 13:17:04 +0100 Michal Hocko <mhocko@kernel.org> wrote:
> >
> > My build test battery says we need also this one, m32r complains
> > otherwise for allmodconfig.
> 
> Note that the m32r architecture is being removed (the removal will be
> in linux-next today) so you might want to remove it from your testing.

Sure, will happily do
 
> Also cris, metag, mn10300, frv, score, blackfin and tile.

Those were not in my list due to predominating failures.

Thanks!
-- 
Michal Hocko
SUSE Labs