Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5003bab8 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds
Browse files

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



Fix error introduced by 37ed19d5
("scripts/mod/modpost.c: fix memory leak").

 - don't kfree("")

 - fix one missed conversion

Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Tested-by: default avatarStephen 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3d30701b

scripts/mod/modpost.c

+3 −2
Original line number Diff line number Diff line
@@ -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;