From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DDB8130C143; Thu, 30 Jul 2026 15:47:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785426448; cv=none; b=m43vXQIUXyLDpAAl+e/MZgMwjbau6iZlV765Chk10gSkC7Xan2QMN/CrseR1XFBSEvuUJdTEH3KBaWpdG/pkLOg2/PI4XMbhqpFyxab2edqjGVk4n5yDzuI8x7moFu9Yy6OSEjgY0+FUYQlhacViOjRgiiohCec29MPPoY7lPT8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785426448; c=relaxed/simple; bh=DeEteOnI+YmTB3ZscIMw0e3Oj9ncBLGhfY6hAzliSdo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ss2gUfMjPjrnlmlSMQt0njaE0SHYDqgrYPSm91ss2+eUFP30+AplkQVBYAJb9/xU2fcWPzfXKU1zeQBTVa9ypZlsyBB4TEE97zukEIkaZ5MB9bB4PIIQ/Km21cEjMfcRFoiHE/V7PIAYRk5VBkwm0LaOEIvDk+aQAqRk3HIpCm0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=zP9ihqFF; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="zP9ihqFF" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4286E1F000E9; Thu, 30 Jul 2026 15:47:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1785426447; bh=Z0oKKdt4fQSrFMC96qxLMrAt8/ONzhwHmfMx/tgtbjE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=zP9ihqFFAF28Esl+aau22kTwu5ZF3q6EQGRU8qhmpQPnkdKYIjIGwd1G49Jun77pw Oep9uksz9dd0wKSFtaKFK+DjMN1fOBfsu+3CgXNg+p1lmVxo/RPdfsmSVTJjlfK2Xc BmKuV03co0uNlBM42Jbxdw59y9CU4TzoSuuJ/HYc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, "Masami Hiramatsu (Google)" Subject: [PATCH 6.12 379/602] tracing/probes: Avoid temporary buffer truncation in trace_probe_match_command_args() Date: Thu, 30 Jul 2026 16:12:51 +0200 Message-ID: <20260730141443.923235441@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260730141435.976815864@linuxfoundation.org> References: <20260730141435.976815864@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Masami Hiramatsu (Google) commit 15f197856d68882af9416fc97516bb55079b7677 upstream. In trace_probe_match_command_args(), a stack buffer buf[MAX_ARGSTR_LEN + 1] (256 bytes) is used to format "=". However, since name can be up to 32 bytes (MAX_ARG_NAME_LEN) and comm up to 255 bytes (MAX_ARGSTR_LEN), the formatted string can exceed 256 bytes and get truncated by snprintf(), causing spurious argument matching failures. Instead of formatting into a temporary buffer on stack, compare the argument name, the '=' delimiter, and the comm expression directly. Link: https://lore.kernel.org/all/178454233010.290363.10428767141343428804.stgit@devnote2/ Fixes: eb5bf81330a7 ("tracing/kprobe: Add per-probe delete from event") Cc: stable@vger.kernel.org Assisted-by: Antigravity:gemini-3.5-flash Signed-off-by: Masami Hiramatsu (Google) Signed-off-by: Greg Kroah-Hartman --- kernel/trace/trace_probe.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) --- a/kernel/trace/trace_probe.c +++ b/kernel/trace/trace_probe.c @@ -2212,16 +2212,17 @@ int trace_probe_compare_arg_type(struct bool trace_probe_match_command_args(struct trace_probe *tp, int argc, const char **argv) { - char buf[MAX_ARGSTR_LEN + 1]; int i; if (tp->nr_args < argc) return false; for (i = 0; i < argc; i++) { - snprintf(buf, sizeof(buf), "%s=%s", - tp->args[i].name, tp->args[i].comm); - if (strcmp(buf, argv[i])) + int len = strlen(tp->args[i].name); + + if (strncmp(argv[i], tp->args[i].name, len) || + argv[i][len] != '=' || + strcmp(argv[i] + len + 1, tp->args[i].comm)) return false; } return true;