From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Morton Subject: Re: linux-next: build failure after merge of the final tree Date: Tue, 10 Aug 2010 22:23:10 -0700 Message-ID: <20100810222310.e04f7031.akpm@linux-foundation.org> References: <20100811133812.2b594551.sfr@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: Received: from smtp1.linux-foundation.org ([140.211.169.13]:57053 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751304Ab0HKFWS (ORCPT ); Wed, 11 Aug 2010 01:22:18 -0400 In-Reply-To: <20100811133812.2b594551.sfr@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: Linus , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Alexey Fomenko , Rusty Russell , Michal Marek , Trevor Keith On Wed, 11 Aug 2010 13:38:12 +1000 Stephen Rothwell wrote: > The only patch new to linux-next since yesterday that affects scripts/mod > is commit 37ed19d5cce35a40d3913cf9aa208ce9f60db3d7 > ("scripts/mod/modpost.c: fix memory leak") from Linus' tree. > > I have reverted that commit in linux-next for today as that makes the > error go away. doh. This? From: Andrew Morton - don't kfree("") - fix one missed conversion Reported-by: Stephen Rothwell Cc: Alexey Fomenko Cc: Trevor Keith Cc: Rusty Russell Cc: Michal Marek Signed-off-by: Andrew Morton --- scripts/mod/modpost.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff -puN scripts/mod/modpost.c~d scripts/mod/modpost.c --- a/scripts/mod/modpost.c~d +++ a/scripts/mod/modpost.c @@ -14,6 +14,7 @@ #define _GNU_SOURCE #include #include +#include #include "modpost.h" #include "../../include/generated/autoconf.h" #include "../../include/linux/license.h" @@ -1167,7 +1168,7 @@ static char *sec2annotation(const char * strcat(p, " "); return r; /* we leak her but we do not care */ } else { - return ""; + return strdup(""); } } @@ -1302,7 +1303,7 @@ static void report_sec_mismatch(const ch "%s%s so it may be used outside an exit section.\n", from, prl_from, fromsym, from_p, to, prl_to, tosym, to_p, - sec2annotation(tosec), tosym, to_p); + prl_to, tosym, to_p); free(prl_from); free(prl_to); break; _