linux-kernel - Re: [PATCH 22/28] tools lib traceevent: Remove malloc_or

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: <20131203111601.540ed5f7@gandalf.local.home>
Date:	Tue, 3 Dec 2013 11:16:01 -0500
From:	Steven Rostedt <rostedt@...dmis.org>
To:	Jiri Olsa <jolsa@...hat.com>
Cc:	linux-kernel@...r.kernel.org,
	Corey Ashford <cjashfor@...ux.vnet.ibm.com>,
	Frederic Weisbecker <fweisbec@...il.com>,
	Ingo Molnar <mingo@...e.hu>,
	Namhyung Kim <namhyung@...nel.org>,
	Paul Mackerras <paulus@...ba.org>,
	Peter Zijlstra <a.p.zijlstra@...llo.nl>,
	Arnaldo Carvalho de Melo <acme@...stprotocols.net>,
	David Ahern <dsahern@...il.com>
Subject: Re: [PATCH 22/28] tools lib traceevent: Remove malloc_or_die from
 event-plugin.c

On Tue,  3 Dec 2013 14:09:36 +0100
Jiri Olsa <jolsa@...hat.com> wrote:

> Removing malloc_or_die calls from event-plugin.c,
> replacing them with standard malloc and error path.
> 
> Suggested-by: Namhyung Kim <namhyung@...nel.org>
> Signed-off-by: Jiri Olsa <jolsa@...hat.com>
> Cc: Corey Ashford <cjashfor@...ux.vnet.ibm.com>
> Cc: Frederic Weisbecker <fweisbec@...il.com>
> Cc: Ingo Molnar <mingo@...e.hu>
> Cc: Namhyung Kim <namhyung@...nel.org>
> Cc: Paul Mackerras <paulus@...ba.org>
> Cc: Peter Zijlstra <a.p.zijlstra@...llo.nl>
> Cc: Arnaldo Carvalho de Melo <acme@...stprotocols.net>
> Cc: Steven Rostedt <rostedt@...dmis.org>
> Cc: David Ahern <dsahern@...il.com>
> ---
>  tools/lib/traceevent/event-plugin.c | 19 ++++++++++++++++---
>  1 file changed, 16 insertions(+), 3 deletions(-)
> 
> diff --git a/tools/lib/traceevent/event-plugin.c b/tools/lib/traceevent/event-plugin.c
> index d272d87..125f567 100644
> --- a/tools/lib/traceevent/event-plugin.c
> +++ b/tools/lib/traceevent/event-plugin.c
> @@ -47,7 +47,11 @@ load_plugin(struct pevent *pevent, const char *path,
>  	char *plugin;
>  	void *handle;
>  
> -	plugin = malloc_or_die(strlen(path) + strlen(file) + 2);
> +	plugin = malloc(strlen(path) + strlen(file) + 2);
> +	if (!plugin) {
> +		warning("could not allocate plugin memory\n");
> +		return;

This should be changed to return an error code. Yes it will require
other places to change for that update as well.

-- Steve

> +	}
>  
>  	strcpy(plugin, path);
>  	strcat(plugin, "/");
--
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/