Skip to contentSkip to conversation

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

DISCUSSION Michal Hocko 3 participants 7 messages Mar 14, 2018 – Mar 15, 2018 1 message not in the archive

Subsystems (3)
lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): 20180306234907.8-AwjmNNh%[email protected]

#1 lore raw
Quoted 17 lines · Andrew Morton

From: Andrew Morton <[email protected]>
Subject: headers-untangle-kmemleakh-from-mmh-fix

security/keys/big_key.c needs vmalloc.h, per sfr

Cc Randy Dunlap <[email protected]>
Cc Stephen Rothwell <[email protected]>

---

 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

security/keys/big_key.c line 24

Quoted 7 lines
security/keys/big_key.c renamed from security/keys/big_key.c~headers-untangle-kmemleakh-from-mmh-fix +1 -0
@@ -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.

Quoted 1 line

From 5c3f7a041df707417532dd64b1d71fc29b24c0fe Mon Sep 17 00:00:00 2001

From: Michal Hocko <[email protected]>
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);
^

---
 security/integrity/digsig.c | 1 +
 1 file changed, 1 insertion(+)
security/integrity/digsig.c +1 -0
index 6f9e4ce568cd..9bb0a7f2863e 100644
@@ -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>
 
Signature · 5 lines
2.16.1

-- 
Michal Hocko
SUSE Labs
#2 lore raw
Quoted 33 lines · On Wed, 14 Mar 2018 13:17:04 +0100 Michal Hocko <[email protected]> wrote:

security/keys/big_key.c line 24

Quoted 10 lines
security/keys/big_key.c renamed from security/keys/big_key.c~headers-untangle-kmemleakh-from-mmh-fix +1 -0
@@ -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.

Quoted 1 line

From 5c3f7a041df707417532dd64b1d71fc29b24c0fe Mon Sep 17 00:00:00 2001

From: Michal Hocko <[email protected]>
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);
^

---
 security/integrity/digsig.c | 1 +
 1 file changed, 1 insertion(+)
security/integrity/digsig.c +0 -0
index 6f9e4ce568cd..9bb0a7f2863e 100644

security/integrity/digsig.c line 23

Quoted 6 lines
security/integrity/digsig.c +1 -0
@@ -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?

#3 lore raw
Quoted 30 lines · Andrew Morton
Quoted 28 lines · On Wed, 14 Mar 2018 13:17:04 +0100 Michal Hocko <[email protected]> wrote:

security/keys/big_key.c line 24

Quoted 10 lines
security/keys/big_key.c renamed from security/keys/big_key.c~headers-untangle-kmemleakh-from-mmh-fix +1 -0
@@ -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.

Quoted 1 line

From 5c3f7a041df707417532dd64b1d71fc29b24c0fe Mon Sep 17 00:00:00 2001

From: Michal Hocko <[email protected]>
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);
^

---
 security/integrity/digsig.c | 1 +
 1 file changed, 1 insertion(+)
Quoted 13 lines

security/integrity/digsig.c line 23

Quoted 11 lines
security/integrity/digsig.c +1 -0
index 6f9e4ce568cd..9bb0a7f2863e 100644
@@ -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 <[email protected]>
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]

And that is why I haven't noticed that.

Signature · 2 lines
Michal Hocko
SUSE Labs
#4 lore raw
Quoted 29 lines · On Wed, 14 Mar 2018 15:57:24 +0100 Michal Hocko <[email protected]> wrote:
Quoted 15 lines

security/integrity/digsig.c line 23

Quoted 13 lines
 1 file changed, 1 insertion(+)
security/integrity/digsig.c +1 -0
index 6f9e4ce568cd..9bb0a7f2863e 100644
@@ -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 <[email protected]>
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]

Quoted 8 lines

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.

#5 lore raw
Quoted 38 lines · Andrew Morton
Quoted 36 lines · On Wed, 14 Mar 2018 15:57:24 +0100 Michal Hocko <[email protected]> wrote:
Quoted 15 lines

security/integrity/digsig.c line 23

Quoted 13 lines
 1 file changed, 1 insertion(+)
security/integrity/digsig.c +1 -0
index 6f9e4ce568cd..9bb0a7f2863e 100644
@@ -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 <[email protected]>
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]

Quoted 5 lines
Quoted 1 line

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.

Signature · 2 lines
Michal Hocko
SUSE Labs
#6 lore raw
In reply to Michal Hocko

Hi Michal,

Quoted 3 lines · On Wed, 14 Mar 2018 13:17:04 +0100 Michal Hocko <[email protected]> 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.

Signature · 2 lines
Cheers,
Stephen Rothwell
#7 lore raw
Quoted 9 lines · Stephen Rothwell

Hi Michal,

Quoted 3 lines · On Wed, 14 Mar 2018 13:17:04 +0100 Michal Hocko <[email protected]> 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

Quoted 1 line

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

Those were not in my list due to predominating failures.

Thanks!

Signature · 2 lines
Michal Hocko
SUSE Labs