Skip to contentSkip to conversation

trace_kprobes: fix memory leak

PATCH In review Lai Jiangshan 2 participants 3 messages Nov 25, 2009 – Nov 27, 2009 Tracing

lore
Share & tools
lore
#0 lore raw

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.

---

kernel/trace/trace_kprobe.c +3 -1
index 79ce6a2..82e8583 100644
@@ -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)
Acked-by on v1 1/3
#1 lore raw

Hi Lai,

Thank you for fixing bugs!

Quoted 27 lines · Lai Jiangshan

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.

---

kernel/trace/trace_kprobe.c +3 -1
index 79ce6a2..82e8583 100644
@@ -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)
Signature · 7 lines
Masami Hiramatsu

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

e-mail: [email protected]
#2 lore raw

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

In reply to Lai Jiangshan
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.

LKML-Reference: <[email protected]>

---
 kernel/trace/trace_kprobe.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
kernel/trace/trace_kprobe.c +3 -1
index 79ce6a2..82e8583 100644
@@ -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)