Re: [PATCH 1/3] trace_kprobes: fix memory leak

From: Masami Hiramatsu
Date: Wed Nov 25 2009 - 07:40:18 EST


Hi Lai,

Thank you for fixing bugs!

Acked-by: Masami Hiramatsu <mhiramat@xxxxxxxxxx>

Lai Jiangshan wrote:
>
> tp->nr_args is not set before we "goto error",
> it causes memory leak for free_trace_probe() use tp->nr_args
> to free memory of args.
>
> Signed-off-by: Lai Jiangshan <laijs@xxxxxxxxxxxxxx>
> ---
> diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
> index 79ce6a2..82e8583 100644
> --- a/kernel/trace/trace_kprobe.c
> +++ b/kernel/trace/trace_kprobe.c
> @@ -704,10 +704,12 @@ static int create_trace_probe(int argc, char **argv)
> ret = parse_probe_arg(arg, &tp->args[i].fetch, is_return);
> if (ret) {
> pr_info("Parse error at argument%d. (%d)\n", i, ret);
> + kfree(tp->args[i].name);
> goto error;
> }
> +
> + tp->nr_args++;
> }
> - tp->nr_args = i;
>
> ret = register_trace_probe(tp);
> if (ret)
>
>

--
Masami Hiramatsu

Software Engineer
Hitachi Computer Products (America), Inc.
Software Solutions Division

e-mail: mhiramat@xxxxxxxxxx

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