From patchwork Thu Mar 2 01:00:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 6009 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp3994542wrd; Wed, 1 Mar 2023 18:21:10 -0800 (PST) X-Google-Smtp-Source: AK7set+joXMhVD8R9nl5/lZKbOpJeeFxLkmugVxFT6FLqE41aPxUc6R41Bs9xFIa5QpsU/5sviJg X-Received: by 2002:a17:906:f216:b0:8b1:3813:7b6 with SMTP id gt22-20020a170906f21600b008b1381307b6mr9460024ejb.30.1677723669900; Wed, 01 Mar 2023 18:21:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677723669; cv=none; d=google.com; s=arc-20160816; b=oMaFmwzgUWqq67Tjta/TzWFmpEQf1nVYC/yjqpD3qP1PeodQgZzsT5yN44GRuDeZRg 0Q2DTjeEb7WiTRBzhVgy82qWX5nzwxkwXvFd6nRyf+AD2/t/odesDFqNANkW8c32GsjI M3kQ8YCrSdab9M8XJWvP/IjAEMhYTan6LOa1vXR0AzTqncvYPn7SgiJOqMihN9Oipzjn 6srS30xYDRY1V4QfX+SDIfXRmmeO86N47siMs9wFL8DHW620D1v5iPWj5ATKrxO1UGf4 GavwxhBRViJRapbRz9m2DjpoRUY2/Qck1rgZ0ApOR3eiQfHpTgTj7A3RGjKlG6TfShL1 +Wcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:subject:cc:to:from:date:user-agent:message-id; bh=mn53u+0ePwvWRyB5iUv4aPIRrPXPt4U0Mw+L+V7El7w=; b=hUh39TE61Ux2a2svyKJwAJlrjCSvdEEDsSsnqqxtCM0p4zJ0Ri9TJzmh+kP1s+TC3k HSb6+ewvlfGdlqbr+ZmSc7HyVCV+58+PufROUvuSq3Q+oSPdiAOW+XW4qo9XJuz+Tj+z tAdyJUXNiwR0Fl+8cPor3eXczztDl3OplSdZ9dL+penyUqmbrUgf7RK6ENKCK+iTLzDP /0w/c2q4vXJtNJcbyv21n1elHsz6Hli/IPsSSTlx3LpkJuemxVzaTjaYPH9fcNGC3rFV Ns1SdHFD2fyFvbZArMFrEIekC5fN3477BN7ZuvaP75iN3/+rNV3OsMmthQal5oLUEeFx hFAg== 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 dr6-20020a170907720600b008c580ab8d9esi8290539ejc.69.2023.03.01.18.20.46; Wed, 01 Mar 2023 18:21:09 -0800 (PST) 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 S229822AbjCBCIR (ORCPT + 99 others); Wed, 1 Mar 2023 21:08:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39282 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229607AbjCBCIO (ORCPT ); Wed, 1 Mar 2023 21:08:14 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0C9951ACC5; Wed, 1 Mar 2023 18:08:13 -0800 (PST) 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 987C961544; Thu, 2 Mar 2023 02:08:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 02179C433D2; Thu, 2 Mar 2023 02:08:11 +0000 (UTC) Received: from rostedt by gandalf.local.home with local (Exim 4.96) (envelope-from ) id 1pXYMc-003Wbh-1i; Wed, 01 Mar 2023 21:08:10 -0500 Message-ID: <20230302010051.044209550@goodmis.org> User-Agent: quilt/0.66 Date: Wed, 01 Mar 2023 20:00:51 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton Subject: [PATCH 0/2] tracing: Fix adding some modifiers to histogram values 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?1759220774918065915?= X-GMAIL-MSGID: =?utf-8?q?1759220774918065915?= Mark Rutland reported to me on IRC that he accidentally added the ".buckets=8" modifier to hitcount. This should not be allowed, but it did not error. Worse yet, when reading the hist file, it would crash as there was a NULL pointer dereference due to the values not having fields assigned to them. The first fix is to make sure that histogram values do not get assigned modifiers that they can't use. The the second patch is to not crash if a NULL pointer is passed to hist_field_name() (which is what happens if you allow some of these modifiers to be used by values). Steven Rostedt (Google) (2): tracing: Do not let histogram values have some modifiers tracing: Check field value in hist_field_name() ---- kernel/trace/trace_events_hist.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)