aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2010-08-11 00:42:26 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-11 08:58:59 -0700
commit5003bab82d56754b27be01eef24495a02e00039d (patch)
treef0b22810356657d8e1ad14a55e76a6b7873133af /scripts
parent3d30701b58970425e1d45994d6cb82f828924fdd (diff)
downloadmrst-s0i3-test-5003bab82d56754b27be01eef24495a02e00039d.tar.gz
mrst-s0i3-test-5003bab82d56754b27be01eef24495a02e00039d.tar.xz
mrst-s0i3-test-5003bab82d56754b27be01eef24495a02e00039d.zip
fix "scripts/mod/modpost.c: fix memory leak"
Fix error introduced by 37ed19d5cce35a40d3913cf9aa208ce9f60db3d7 ("scripts/mod/modpost.c: fix memory leak"). - don't kfree("") - fix one missed conversion Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Tested-by: Stephen Rothwell <sfr@canb.auug.org.au> Cc: Alexey Fomenko <ext-alexey.fomenko@nokia.com> Cc: Trevor Keith <tsrk@tsrk.net> Cc: Rusty Russell <rusty@rustcorp.com.au> Cc: Michal Marek <mmarek@suse.cz> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/mod/modpost.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 1ce655dde99..7acbdd8fcae 100644
--- a/scripts/mod/modpost.c
+++ b/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"
@@ -1217,7 +1218,7 @@ static char *sec2annotation(const char *s)
strcat(p, " ");
return r; /* we leak her but we do not care */
} else {
- return "";
+ return strdup("");
}
}
@@ -1352,7 +1353,7 @@ static void report_sec_mismatch(const char *modname,
"%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;