Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753622AbdIFMdF (ORCPT ); Wed, 6 Sep 2017 08:33:05 -0400 Received: from victor.provo.novell.com ([137.65.250.26]:60597 "EHLO prv3-mh.provo.novell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753004AbdIFMdD (ORCPT ); Wed, 6 Sep 2017 08:33:03 -0400 Message-ID: <1504701173.5057.10.camel@suse.com> Subject: Re: linux-next: build failure after merge of the akpm-current tree From: Martin Wilck To: Stephen Rothwell , Andrew Morton , Jens Axboe Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Kees Cook , Sagi Grimberg , Christoph Hellwig Date: Wed, 06 Sep 2017 14:32:53 +0200 In-Reply-To: <20170831182101.0e4ad9a2@canb.auug.org.au> References: <20170831182101.0e4ad9a2@canb.auug.org.au> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.24.4 Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2170 Lines: 71 Hello Stephen, On Thu, 2017-08-31 at 18:21 +1000, Stephen Rothwell wrote: > 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 > 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 > --- > 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 , Tel. +49 (0)911 74053 2107 SUSE Linux GmbH, GF: Felix Imendörffer, Jane Smithard, Graham Norton HRB 21284 (AG Nürnberg)