Received-SPF: pass (google.com: domain of linux-kernel+bounces-168691-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
Date: Sat, 4 May 2024 22:19:17 +0900
From: Masami Hiramatsu (Google) <mhiramat@kernel.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: LuMingYin <lumingyindetect@126.com>, Steven Rostedt
 <rostedt@goodmis.org>, Masami Hiramatsu <mhiramat@kernel.org>,
 linux-kernel@vger.kernel.org
Subject: [GIT PULL] probes: Fixes for v6.9-rc6
Message-Id: <20240504221917.4917a9eac7ab8cc90a0af5a1@kernel.org>
Precedence: bulk
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit

Hi Linus,

Probes fixes for v6.9-rc6:

- probe-events: Fix memory leak in parsing probe argument. There is a
  memory leak (forget to free an allocated buffer) in a memory allocation
  failure path. Fixes it to jump to the correct error handling code.


Please pull the latest probes-fixes-v6.9-rc6 tree, which can be found at:


  git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git
probes-fixes-v6.9-rc6

Tag SHA1: 7ecfa9b34f812e244746158de5abfdd5132a4a62
Head SHA1: dce3696271af7765f04428ec31b1b87dc7d016c6


LuMingYin (1):
      tracing/probes: Fix memory leak in traceprobe_parse_probe_arg_body()

----
 kernel/trace/trace_probe.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---------------------------
commit dce3696271af7765f04428ec31b1b87dc7d016c6
Author: LuMingYin <lumingyindetect@126.com>
Date:   Sat Apr 27 08:23:47 2024 +0100

    tracing/probes: Fix memory leak in traceprobe_parse_probe_arg_body()
    
    If traceprobe_parse_probe_arg_body() failed to allocate 'parg->fmt',
    it jumps to the label 'out' instead of 'fail' by mistake.In the result,
    the buffer 'tmp' is not freed in this case and leaks its memory.
    
    Thus jump to the label 'fail' in that error case.
    
    Link: https://lore.kernel.org/all/20240427072347.1421053-1-lumingyindetect@126.com/
    
    Fixes: 032330abd08b ("tracing/probes: Cleanup probe argument parser")
    Signed-off-by: LuMingYin <lumingyindetect@126.com>
    Acked-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
    Signed-off-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>

diff --git a/kernel/trace/trace_probe.c b/kernel/trace/trace_probe.c
index dfe3ee6035ec..42bc0f362226 100644
--- a/kernel/trace/trace_probe.c
+++ b/kernel/trace/trace_probe.c
@@ -1466,7 +1466,7 @@ static int traceprobe_parse_probe_arg_body(const char *argv, ssize_t *size,
 		parg->fmt = kmalloc(len, GFP_KERNEL);
 		if (!parg->fmt) {
 			ret = -ENOMEM;
-			goto out;
+			goto fail;
 		}
 		snprintf(parg->fmt, len, "%s[%d]", parg->type->fmttype,
 			 parg->count);

-- 
Masami Hiramatsu (Google) <mhiramat@kernel.org>