From patchwork Tue Mar 14 19:02:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 69803 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1935534wrd; Tue, 14 Mar 2023 12:09:01 -0700 (PDT) X-Google-Smtp-Source: AK7set9YPZxC/a0FxdFMSjtmI7m6qqNcO0ZdygVmPabr/tRQMrANphshGLfH9qVnuuRhQMSh5YiH X-Received: by 2002:a17:90b:380f:b0:239:ea16:5b13 with SMTP id mq15-20020a17090b380f00b00239ea165b13mr40153166pjb.14.1678820941319; Tue, 14 Mar 2023 12:09:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678820941; cv=none; d=google.com; s=arc-20160816; b=DY8WOEy5xoUUQXDTnIYz3W7C5q0cRARlQsYJERLTTcjbx8cHP7GAtuXHEUHBzcZPz8 JLZowNvsraXTAhcn10J5eDZZuyahi4v5DWtJHSgKxl1Mo2encbG/7erUwwVCqKfUVE/3 iVwhJAd9WvHspHLAMrg7zLtYldtDiUwMcl5TU+aNlYchG25Z3HZAJG52ot7sDtzpUv3y e2XHtMZn45LBTNLdYs1ZjJc463xGSOAtapjJWCriCq/gDXv9B8JxiY9bw79hx4mp822Y nvYGsjosDnsjCXLB97YhmY5fWrYzp+6lmWrbWPGO8XZLy/CSg9M307pQ+9yaCcvJsmFY 8nog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:subject:cc:to:from:date :user-agent:message-id; bh=VSUq3x/E+0rBFayUsABwueZIuYJ/eeagz7hHSVOxDTg=; b=OVZLviaDeSbMH0D61/0EAb8w4zHY158EeBPLKvVUAemiF+Qy0UG6pLilpayNd3k7nL EdlCSJz0+ocH9CuGQGSRL7UHN+QZp7OEO/Yy1RpXW6zzLSO8DeBR79EM9bs7YcWgiRhu a8IVlNQhnedsqi/FT8T8qxaIshOGep6e+brI69WEwgzTz8UDDR1v646ltODLHFMCFqvY ajC3c63e9AmHGltGdm7eJAKs0YKugvTulXRqOyu+lX9ZfFn0Bf9oIUj4wAfgiiUzsYet YdadZeFT8OnJhGVcaLhTrR0tHX/hqvh4bdk3SDYsEQzdOPUdS48usNwOxb8cJ8pvAQAF ojTA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x7-20020a17090aca0700b00233cea2dab8si3013007pjt.121.2023.03.14.12.08.45; Tue, 14 Mar 2023 12:09:01 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230176AbjCNTEM (ORCPT + 99 others); Tue, 14 Mar 2023 15:04:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56246 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230203AbjCNTEJ (ORCPT ); Tue, 14 Mar 2023 15:04:09 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AF7DFF77A; Tue, 14 Mar 2023 12:03:27 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 9334D61965; Tue, 14 Mar 2023 19:03:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0EAA7C433A0; Tue, 14 Mar 2023 19:03:11 +0000 (UTC) Received: from rostedt by gandalf.local.home with local (Exim 4.96) (envelope-from ) id 1pc9vS-009ty7-0A; Tue, 14 Mar 2023 15:03:10 -0400 Message-ID: <20230314190309.859934963@goodmis.org> User-Agent: quilt/0.66 Date: Tue, 14 Mar 2023 15:02:38 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Andrew Morton , stable@vger.kernel.org, Mark Rutland Subject: [for-linus][PATCH 2/5] tracing: Check field value in hist_field_name() References: <20230314190236.203370742@goodmis.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.0 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760371347327614816?= X-GMAIL-MSGID: =?utf-8?q?1760371347327614816?= From: "Steven Rostedt (Google)" The function hist_field_name() cannot handle being passed a NULL field parameter. It should never be NULL, but due to a previous bug, NULL was passed to the function and the kernel crashed due to a NULL dereference. Mark Rutland reported this to me on IRC. The bug was fixed, but to prevent future bugs from crashing the kernel, check the field and add a WARN_ON() if it is NULL. Link: https://lkml.kernel.org/r/20230302020810.762384440@goodmis.org Cc: stable@vger.kernel.org Cc: Masami Hiramatsu Cc: Andrew Morton Reported-by: Mark Rutland Fixes: c6afad49d127f ("tracing: Add hist trigger 'sym' and 'sym-offset' modifiers") Tested-by: Mark Rutland Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace_events_hist.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c index 6e8ab726a7b5..486cca3c2b75 100644 --- a/kernel/trace/trace_events_hist.c +++ b/kernel/trace/trace_events_hist.c @@ -1331,6 +1331,9 @@ static const char *hist_field_name(struct hist_field *field, { const char *field_name = ""; + if (WARN_ON_ONCE(!field)) + return field_name; + if (level > 1) return field_name;