Re: linux-next: build failure after merge of the akpm-current tree
From: Martin Wilck <hidden>
Date: 2017-09-06 12:33:05
Also in:
lkml
Hello Stephen, On Thu, 2017-08-31 at 18:21 +1000, Stephen Rothwell wrote:
quoted hunk ↗ jump to hunk
Hi Andrew, After merging the akpm-current tree, today's linux-next build (arm multi_v7_defconfig) failed like this: In file included from /home/sfr/next/next/include/uapi/linux/uuid.h:21:0, from /home/sfr/next/next/include/linux/uuid.h:19, from /home/sfr/next/next/include/linux/mod_devicetable.h:12, from /home/sfr/next/next/scripts/mod/devicetable- offsets.c:2: /home/sfr/next/next/include/linux/string.h: In function 'memcpy_and_pad': /home/sfr/next/next/include/linux/string.h:450:3: error: implicit declaration of function 'fortify_panic' [-Werror=implicit-function- declaration] fortify_panic(__func__); ^ Caused by commit 9b04e51112ba ("fortify: use WARN instead of BUG for now") interacting with commit 01f33c336e2d ("string.h: add memcpy_and_pad()") from the block tree. I have applied the following merge fix patch: From: Stephen Rothwell <redacted> Date: Thu, 31 Aug 2017 18:13:43 +1000 Subject: [PATCH] fortify: use WARN instead of BUG for now fix Signed-off-by: Stephen Rothwell <redacted> --- include/linux/string.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)diff --git a/include/linux/string.h b/include/linux/string.h index edd2b6154b80..e3b713114732 100644 --- a/include/linux/string.h +++ b/include/linux/string.h@@ -447,7 +447,7 @@ __FORTIFY_INLINE void memcpy_and_pad(void *dest,size_t dest_len, __read_overflow3(); } if (dest_size < dest_len) - fortify_panic(__func__); + fortify_overflow(__func__); if (dest_len > count) { memcpy(dest, src, count); memset(dest + count, pad, dest_len - count); -- 2.13.2
Arnd Bergmann spotted another problem with that patch. I decided to rip out the "fortify" related code. I'll send a patch in a follow-up email. Regards, Martin -- Dr. Martin Wilck [off-list ref], Tel. +49 (0)911 74053 2107 SUSE Linux GmbH, GF: Felix Imendörffer, Jane Smithard, Graham Norton HRB 21284 (AG Nürnberg)