From patchwork Sun Jul 23 20:06:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 124543 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp1421358vqg; Sun, 23 Jul 2023 13:35:09 -0700 (PDT) X-Google-Smtp-Source: APBJJlHONkjMX7B1ifal44SHJmbAKVDN1NUqlRBYIOhHxSHTOE+iPxEH6cJWm3D/b+Gs25OLVS8Q X-Received: by 2002:a05:6a00:1914:b0:66e:4df5:6c10 with SMTP id y20-20020a056a00191400b0066e4df56c10mr6702494pfi.34.1690144509008; Sun, 23 Jul 2023 13:35:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690144508; cv=none; d=google.com; s=arc-20160816; b=bDjv8OIzpGi/WRXQoqjcDvRNRkfW7ZVBHr8NcoPF0nDkFWKAL/G+9vlyrOsNB/iL3/ QKlqluf7UxqRha7Vdroa4frjOK7M4lIlvvkNaEQymC88jFwu4mJHllGYC6KVocKiccfF xT8x4jxEfnvj/DUyz+A6VVHMndLoqnio7y9caVIWVTZJYvyzQKYq8kl4+0ELYbQMTufv NCIuUba/ci82hIc0OUwKbJcj9+jp0tvBjGbfAycCpcQjwMV9SIj+lNWchUFewS6b5msY rVJ857iEV1Bxn76Ka2e/IKGGLVZ5FsAenyRumEnoVQwjqcAPxGJ3U+uKO8KOHP2x6KgK eyqw== 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=jJFC4mODE5/XRfnG5dLKOufcF8GNfZ9J+e3L9dpeu/8=; fh=p45q1WWgEXavu+xGZjI3fje8HNDUyzibSBun5XMMRhY=; b=cQqqBvLkfBExKm2PWUhwYTaQpsGwV0NUbyHYuhQ60DmQ5Mxf9yM0/HKTnyayi4hjcO BWlueOQmbJCDF2xqsF+7+3CNnc9/vcq5ecP2Xv0QeP+kVoga1yi0b55AGEM6AHcAWoeB qdwYwRlRSFfrdAO7ZeqWeYxYt7E3azvG6gjEpLVojMrG5FLneLKNyH5hvGcuqSjMsGhd +T+a4phNdXMJyCxjMqG5K8E/t+vtB1i9uGaPwrpYQ1gnJihmySm99nD+wYiM8HwoYKYO L/reu2iDtByg4wG+OnJoCqAw3S7pEmyxjjgU9P7vFeMGZZEkY1t1O7DTdVBLcFsRGaY3 +ezw== 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 ch7-20020a056a00288700b006825f34417fsi7402836pfb.238.2023.07.23.13.34.55; Sun, 23 Jul 2023 13:35:08 -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 S229983AbjGWUHB (ORCPT + 99 others); Sun, 23 Jul 2023 16:07:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59082 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229775AbjGWUG4 (ORCPT ); Sun, 23 Jul 2023 16:06:56 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 24A3AE5B; Sun, 23 Jul 2023 13:06:56 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id AA7E460E9F; Sun, 23 Jul 2023 20:06:55 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1AE37C433CD; Sun, 23 Jul 2023 20:06:55 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1qNfLy-001c3I-0L; Sun, 23 Jul 2023 16:06:54 -0400 Message-ID: <20230723200653.918039652@goodmis.org> User-Agent: quilt/0.66 Date: Sun, 23 Jul 2023 16:06:26 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton , stable@vger.kernel.org, Mohamed Khalfella Subject: [for-linus][PATCH 3/3] tracing/histograms: Return an error if we fail to add histogram to hist_vars list References: <20230723200623.034313147@goodmis.org> MIME-Version: 1.0 X-Spam-Status: No, score=-6.7 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE 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: INBOX X-GMAIL-THRID: 1772244968704223966 X-GMAIL-MSGID: 1772244968704223966 From: Mohamed Khalfella Commit 6018b585e8c6 ("tracing/histograms: Add histograms to hist_vars if they have referenced variables") added a check to fail histogram creation if save_hist_vars() failed to add histogram to hist_vars list. But the commit failed to set ret to failed return code before jumping to unregister histogram, fix it. Link: https://lore.kernel.org/linux-trace-kernel/20230714203341.51396-1-mkhalfella@purestorage.com Cc: stable@vger.kernel.org Fixes: 6018b585e8c6 ("tracing/histograms: Add histograms to hist_vars if they have referenced variables") Signed-off-by: Mohamed Khalfella Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace_events_hist.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c index c8c61381eba4..d06938ae0717 100644 --- a/kernel/trace/trace_events_hist.c +++ b/kernel/trace/trace_events_hist.c @@ -6668,7 +6668,8 @@ static int event_hist_trigger_parse(struct event_command *cmd_ops, goto out_unreg; if (has_hist_vars(hist_data) || hist_data->n_var_refs) { - if (save_hist_vars(hist_data)) + ret = save_hist_vars(hist_data); + if (ret) goto out_unreg; }