linux-kernel - Re: linux-next: build failure after merge of the final tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <20100810222310.e04f7031.akpm@linux-foundation.org>
Date:	Tue, 10 Aug 2010 22:23:10 -0700
From:	Andrew Morton <akpm@...ux-foundation.org>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Linus <torvalds@...ux-foundation.org>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	Alexey Fomenko <ext-alexey.fomenko@...ia.com>,
	Rusty Russell <rusty@...tcorp.com.au>,
	Michal Marek <mmarek@...e.cz>, Trevor Keith <tsrk@...k.net>
Subject: Re: linux-next: build failure after merge of the final tree

On Wed, 11 Aug 2010 13:38:12 +1000 Stephen Rothwell <sfr@...b.auug.org.au> 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 <akpm@...ux-foundation.org>

- don't kfree("")

- fix one missed conversion

Reported-by: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Alexey Fomenko <ext-alexey.fomenko@...ia.com>
Cc: Trevor Keith <tsrk@...k.net>
Cc: Rusty Russell <rusty@...tcorp.com.au>
Cc: Michal Marek <mmarek@...e.cz>
Signed-off-by: Andrew Morton <akpm@...ux-foundation.org>
---

 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 <stdio.h>
 #include <ctype.h>
+#include <string.h>
 #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;
_

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/