iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix "scripts/mod/modpost.c: fix memory leak"

Browse Source 
Fix error introduced by 37ed19d5cc
("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>
This commit is contained in:
Andrew Morton 2010-08-11 00:42:26 -07:00 committed by Linus Torvalds
parent 3d30701b58
commit 5003bab82d
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/mod/modpost.c
View File

@ -14,6 +14,7 @@
#define _GNU_SOURCE #define _GNU_SOURCE
#include <stdio.h> #include <stdio.h>
#include <ctype.h> #include <ctype.h>
#include <string.h>
#include "modpost.h" #include "modpost.h"
#include "../../include/generated/autoconf.h" #include "../../include/generated/autoconf.h"
#include "../../include/linux/license.h" #include "../../include/linux/license.h"
@ -1217,7 +1218,7 @@ static char *sec2annotation(const char *s)
strcat(p, " "); strcat(p, " ");
return r; /* we leak her but we do not care */ return r; /* we leak her but we do not care */
} else { } 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", "%s%s so it may be used outside an exit section.\n",
from, prl_from, fromsym, from_p, from, prl_from, fromsym, from_p,
to, prl_to, tosym, to_p, to, prl_to, tosym, to_p,
sec2annotation(tosec), tosym, to_p); prl_to, tosym, to_p);
free(prl_from); free(prl_from);
free(prl_to); free(prl_to);
break; break;