2009-11-25 08:32:53

by Lai Jiangshan

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

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 <[email protected]>
---
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)

2009-11-25 12:39:52

by Masami Hiramatsu

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

Hi Lai,

Thank you for fixing bugs!

Acked-by: Masami Hiramatsu <[email protected]>

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 <[email protected]>
> ---
> 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: [email protected]

2009-11-27 05:50:15

by Lai Jiangshan

Subject: [tip:perf/core] trace_kprobes: Fix memory leak

Commit-ID: abab9d37d2a826fcf588c5f30152dbe05c40111c
Gitweb: http://git.kernel.org/tip/abab9d37d2a826fcf588c5f30152dbe05c40111c
Author: Lai Jiangshan <[email protected]>
AuthorDate: Wed, 25 Nov 2009 16:32:21 +0800
Committer: Ingo Molnar <[email protected]>
CommitDate: Fri, 27 Nov 2009 06:43:04 +0100

trace_kprobes: Fix memory leak

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 <[email protected]>
Acked-by: Masami Hiramatsu <[email protected]>
Cc: Steven Rostedt <[email protected]>
Cc: Frederic Weisbecker <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>
---
kernel/trace/trace_kprobe.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)

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)