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 99A913ACA4D; Sat, 30 May 2026 17:36:13 +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=1780162576; cv=none; b=e3qExHCfZt8na8MAnNEACrzQQp4/B0wXOiYb0k3A2YpsSVbI9qOFpuJBn9NZxZlzR2mFKZ8cbc1Fdu/gy4y0oWHczW6NFA+30oxVGi+/gdowqqHAuHYpRJs+HFFtIlg6WKTy+Aqw2fZ1i43pQ3xCPK+zA0OP9PCFJMPX+QLglxc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780162576; c=relaxed/simple; bh=boi2lPaSkFInUuhZoA0lpUXoHupurQsLSzA9H/Ni8r8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bb5zr2lUxZoqiQrN9P2/9D0OA+olQ9fg01fQcqWzY/sFjWOs18/h53a0xvT7Dsolw/Fn4kkGT+7L8Z6bMgOBdtmnQCee9fc6fopyeDNFgt++FHVwtlQ29+jEDsEwmciEqkvAh4gDqtpRu3WRjyBVIBh3SyYFZJSBRMpYdFclN8Q= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=NOAwJjEY; 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="NOAwJjEY" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AEE6F1F00898; Sat, 30 May 2026 17:36:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1780162573; bh=ILL6WY/czHxEMYJWdfWkXFwf/drBYEpuE6GbHKkfE0o=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=NOAwJjEYM3ReH1R2uWa5xK+0ypG6GrDoipnl4ZApruznrX3V0OkaGJTodNQH/R3Fx ZMDz4ZX72n22glXcUptMAFbPLDRmMxr+4n3CV7tZCF7qStQQYtx0hXoxlBMzm6eFEx zjsSLuVJc5ArOzekyd/0b9qkYCpqgLk6bf4bRrf4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, David Carlier , Steven Rostedt , Sasha Levin Subject: [PATCH 6.1 963/969] tracing: Avoid NULL return from hist_field_name() on truncation Date: Sat, 30 May 2026 18:08:07 +0200 Message-ID: <20260530160327.363469101@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260530160300.485627683@linuxfoundation.org> References: <20260530160300.485627683@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: David Carlier [ Upstream commit 576ec047d20b368b43c4d5db98c4f2e0f3c101ec ] hist_field_name() returns "" everywhere except the fully-qualified VAR_REF/EXPR case, where snprintf() truncation returns NULL early and bypasses the bottom NULL->"" guard. Callers don't expect NULL: strcat(expr, hist_field_name(field, 0)) at trace_events_hist.c:1758 and the strcmp() in the sort-key match loop at :4804 both deref it. system and event_name are bounded by MAX_EVENT_NAME_LEN, but the field name on a VAR_REF is kstrdup'd from a histogram variable name parsed out of the trigger string and has no length cap, so a long enough var name in a fully qualified reference can reach the truncation path. Keep the length check but leave field_name as "" on overflow. Link: https://patch.msgid.link/20260508195747.25492-1-devnexen@gmail.com Fixes: 5ec1d1e97de1 ("tracing: Rebuild full_name on each hist_field_name() call") Signed-off-by: David Carlier Signed-off-by: Steven Rostedt Signed-off-by: Sasha Levin --- kernel/trace/trace_events_hist.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c index b5276f2f2cf40..336fc54d8ec86 100644 --- a/kernel/trace/trace_events_hist.c +++ b/kernel/trace/trace_events_hist.c @@ -1351,10 +1351,8 @@ static const char *hist_field_name(struct hist_field *field, len = snprintf(full_name, sizeof(full_name), "%s.%s.%s", field->system, field->event_name, field->name); - if (len >= sizeof(full_name)) - return NULL; - - field_name = full_name; + if (len < sizeof(full_name)) + field_name = full_name; } else field_name = field->name; } else if (field->flags & HIST_FIELD_FL_TIMESTAMP) -- 2.53.0