public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org
Cc: Ingo Molnar <mingo@kernel.org>,
	Andrew Morton <akpm@linux-foundation.org>,
	stable@vger.kernel.org, Masami Hiramatsu <mhiramat@kernel.org>,
	Vamshi K Sthambamkadi <vamshi.k.sthambamkadi@gmail.com>
Subject: [for-linus][PATCH 11/17] tracing/probe: Fix memleak in fetch_op_data operations
Date: Thu, 18 Jun 2020 19:56:07 -0400	[thread overview]
Message-ID: <20200618235640.748875246@goodmis.org> (raw)
In-Reply-To: 20200618235556.451120786@goodmis.org

From: Vamshi K Sthambamkadi <vamshi.k.sthambamkadi@gmail.com>

kmemleak report:
    [<57dcc2ca>] __kmalloc_track_caller+0x139/0x2b0
    [<f1c45d0f>] kstrndup+0x37/0x80
    [<f9761eb0>] parse_probe_arg.isra.7+0x3cc/0x630
    [<055bf2ba>] traceprobe_parse_probe_arg+0x2f5/0x810
    [<655a7766>] trace_kprobe_create+0x2ca/0x950
    [<4fc6a02a>] create_or_delete_trace_kprobe+0xf/0x30
    [<6d1c8a52>] trace_run_command+0x67/0x80
    [<be812cc0>] trace_parse_run_command+0xa7/0x140
    [<aecfe401>] probes_write+0x10/0x20
    [<2027641c>] __vfs_write+0x30/0x1e0
    [<6a4aeee1>] vfs_write+0x96/0x1b0
    [<3517fb7d>] ksys_write+0x53/0xc0
    [<dad91db7>] __ia32_sys_write+0x15/0x20
    [<da347f64>] do_syscall_32_irqs_on+0x3d/0x260
    [<fd0b7e7d>] do_fast_syscall_32+0x39/0xb0
    [<ea5ae810>] entry_SYSENTER_32+0xaf/0x102

Post parse_probe_arg(), the FETCH_OP_DATA operation type is overwritten
to FETCH_OP_ST_STRING, as a result memory is never freed since
traceprobe_free_probe_arg() iterates only over SYMBOL and DATA op types

Setup fetch string operation correctly after fetch_op_data operation.

Link: https://lkml.kernel.org/r/20200615143034.GA1734@cosmos

Cc: stable@vger.kernel.org
Fixes: a42e3c4de964 ("tracing/probe: Add immediate string parameter support")
Acked-by: Masami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: Vamshi K Sthambamkadi <vamshi.k.sthambamkadi@gmail.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
---
 kernel/trace/trace_probe.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/trace/trace_probe.c b/kernel/trace/trace_probe.c
index b8a928e925c7..d2867ccc6aca 100644
--- a/kernel/trace/trace_probe.c
+++ b/kernel/trace/trace_probe.c
@@ -639,8 +639,8 @@ static int traceprobe_parse_probe_arg_body(char *arg, ssize_t *size,
 			ret = -EINVAL;
 			goto fail;
 		}
-		if ((code->op == FETCH_OP_IMM || code->op == FETCH_OP_COMM) ||
-		     parg->count) {
+		if ((code->op == FETCH_OP_IMM || code->op == FETCH_OP_COMM ||
+		     code->op == FETCH_OP_DATA) || parg->count) {
 			/*
 			 * IMM, DATA and COMM is pointing actual address, those
 			 * must be kept, and if parg->count != 0, this is an
-- 
2.26.2



  parent reply	other threads:[~2020-06-18 23:56 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-18 23:55 [for-linus][PATCH 00/17] tracing: Updates for 5.8 Steven Rostedt
2020-06-18 23:55 ` [for-linus][PATCH 01/17] recordmcount: support >64k sections Steven Rostedt
2020-06-18 23:55 ` [for-linus][PATCH 02/17] kprobes: Suppress the suspicious RCU warning on kprobes Steven Rostedt
2020-06-18 23:55 ` [for-linus][PATCH 03/17] kprobes: Use non RCU traversal APIs on kprobe_tables if possible Steven Rostedt
2020-06-18 23:56 ` [for-linus][PATCH 04/17] kprobes: Fix to protect kick_kprobe_optimizer() by kprobe_mutex Steven Rostedt
2020-06-18 23:56 ` [for-linus][PATCH 05/17] kprobes: Remove redundant arch_disarm_kprobe() call Steven Rostedt
2020-06-18 23:56 ` [for-linus][PATCH 06/17] kretprobe: Prevent triggering kretprobe from within kprobe_flush_task Steven Rostedt
2020-06-18 23:56 ` [for-linus][PATCH 07/17] sample-trace-array: Fix sleeping function called from invalid context Steven Rostedt
2020-06-18 23:56 ` [for-linus][PATCH 08/17] sample-trace-array: Remove trace_array sample-instance Steven Rostedt
2020-06-18 23:56 ` [for-linus][PATCH 09/17] tracing: Make ftrace packed events have align of 1 Steven Rostedt
2020-06-18 23:56 ` [for-linus][PATCH 10/17] trace: Fix typo in allocate_ftrace_ops()s comment Steven Rostedt
2020-06-18 23:56 ` Steven Rostedt [this message]
2020-06-18 23:56 ` [for-linus][PATCH 12/17] tracing: Remove unused event variable in tracing_iter_reset Steven Rostedt
2020-06-18 23:56 ` [for-linus][PATCH 13/17] proc/bootconfig: Fix to use correct quotes for value Steven Rostedt
2020-06-18 23:56 ` [for-linus][PATCH 14/17] tools/bootconfig: " Steven Rostedt
2020-06-18 23:56 ` [for-linus][PATCH 15/17] tools/bootconfig: Fix to return 0 if succeeded to show the bootconfig Steven Rostedt
2020-06-18 23:56 ` [for-linus][PATCH 16/17] tools/bootconfig: Add testcase for show-command and quotes test Steven Rostedt
2020-06-18 23:56 ` [for-linus][PATCH 17/17] ftrace: Fix maybe-uninitialized compiler warning Steven Rostedt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200618235640.748875246@goodmis.org \
    --to=rostedt@goodmis.org \
    --cc=akpm@linux-foundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mhiramat@kernel.org \
    --cc=mingo@kernel.org \
    --cc=stable@vger.kernel.org \
    --cc=vamshi.k.sthambamkadi@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox