From patchwork Wed Nov 16 09:14:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 20827 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp43238wru; Wed, 16 Nov 2022 01:26:54 -0800 (PST) X-Google-Smtp-Source: AA0mqf7ra5qQp6sVflGm81wgskjDew1Zcoui1gVt4WbavkjGk+qdHMN8teHaqd3NjEfRWLz438qM X-Received: by 2002:a05:6402:1859:b0:468:51b0:295 with SMTP id v25-20020a056402185900b0046851b00295mr4891111edy.319.1668590814059; Wed, 16 Nov 2022 01:26:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668590814; cv=none; d=google.com; s=arc-20160816; b=LfAT5jyeBRk38W6ZRTX9ZMLpbXngl7TCLtKPLhf1th4TzraGJK0p/56JIwPaqbDHzF jRE/2YnfYGnGzVrqPe7lFTqP7CSzvXzW2EDii0fjUCdvHIV2RG/LijvlabJDmiP7XB6M cPJEZFdYZ0fKKalr0VvIgKXe2A7wJNSk/rexbZhD+nAqxDNX3Tcehj2590thTQvwhH1k FBNJfZdVyieoVsWgGAzMUnCRc0Hx5HjVHmK0JMFQWLayiSBgMd6xVqHhhaeD61hY9AR9 bEg7Jm+sKfQBhuErMSNh2bLGU7hOxE2dhgCyVsN0nbgrzC1wv51B35iQMxBXHIZm1msW Ax9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=ntXmTzcMVrQc++9yhCFjiIC9jVlTb71PBDC8seZSSSU=; b=Cdlo+yQi9AOJGsmCa8XAtNgPOAM2cGaUtLUKeLGbCjcCvx8ajUktYIam72yjSynqeu 5rUxOHbgnU8NX97q/F0ddlMhnf0hrk2rGjiluwaZudhm2Cd4ABYBcpy7eFxErjbcH8FB /4rU9b7qnOGoEyVuvPB8xxVNok+Mumw7zPyOYfDAYxIWR2Lc67Tr2n80e2Az7ZcyBB84 e3wLL3S2heqv11d4nbphsDzciYo/GRv07pHSriAHgv4w/mNFMI8nqs7feJNxLRsfM3/d JMEh9Faw9A+hONn08UwwzuOEZ7V+VKkImtmrc95R1ag6gu1pPCYPPKAT/qsm0woXAKjx hqgA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=zIEwQAiu; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=ePhxbwo+; 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; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q6-20020a1709064c8600b007ada2efa6b7si10891972eju.567.2022.11.16.01.26.30; Wed, 16 Nov 2022 01:26:54 -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; dkim=pass header.i=@linutronix.de header.s=2020 header.b=zIEwQAiu; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=ePhxbwo+; 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; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233033AbiKPJOg (ORCPT + 99 others); Wed, 16 Nov 2022 04:14:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38740 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230280AbiKPJOa (ORCPT ); Wed, 16 Nov 2022 04:14:30 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CC0AE62C1; Wed, 16 Nov 2022 01:14:29 -0800 (PST) Date: Wed, 16 Nov 2022 09:14:27 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1668590068; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ntXmTzcMVrQc++9yhCFjiIC9jVlTb71PBDC8seZSSSU=; b=zIEwQAiuscQ6JqTADM0FtvuJjHb+dJznnXpqivThgP05jflGCzFDBNZEwuQWmraB6tR7MI 7z9cg0+NUCwkzR7C+bZtggiJ4QebTUYdFi5GdgobWfe4eOR0sY/NGyIJ4BYM/1KtGiDVXY PyA8bG2bFdmqpymMW00132iAKtKmb8Ies6216bWZNo2io+SgJ2zPxKmO7NiNTa5KHB+m0J DcUodSRYbEgmxEH67BYmK9DU0s2Uh0kemlGRSPI61KgCVL4QTm6ap8gzaHC9B4ppw85i7R h2fnWi+0RGE4m8YVOLWZG9BFfqUagZEgrIItjsGthLI28l7/jYOIDAFr9b71DQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1668590068; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ntXmTzcMVrQc++9yhCFjiIC9jVlTb71PBDC8seZSSSU=; b=ePhxbwo+I+MjhTdlse1fz4nuGKZtn8ZrUCV3o2F1dsZSQOSuSshh11EktvKe5aSoO1KMQL s5en9am3v3phQDAw== From: "tip-bot2 for Gaosheng Cui" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: perf/core] perf: Fix IS_ERR() vs NULL check in inherit_event() Cc: Gaosheng Cui , "Peter Zijlstra (Intel)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20221114091833.1492575-1-cuigaosheng1@huawei.com> References: <20221114091833.1492575-1-cuigaosheng1@huawei.com> MIME-Version: 1.0 Message-ID: <166859006717.4906.1082358264373442577.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,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?1749644281584231454?= X-GMAIL-MSGID: =?utf-8?q?1749644281584231454?= The following commit has been merged into the perf/core branch of tip: Commit-ID: c55bfbb3ebce4e0956972f02b82673950ad1a2d2 Gitweb: https://git.kernel.org/tip/c55bfbb3ebce4e0956972f02b82673950ad1a2d2 Author: Gaosheng Cui AuthorDate: Mon, 14 Nov 2022 17:18:33 +08:00 Committer: Peter Zijlstra CommitterDate: Tue, 15 Nov 2022 22:30:11 +01:00 perf: Fix IS_ERR() vs NULL check in inherit_event() The find_get_pmu_context() returns an ERR_PTR() on failure, we should use IS_ERR() to check the return value. Fixes: bd2756811766 ("perf: Rewrite core context handling") Signed-off-by: Gaosheng Cui Signed-off-by: Peter Zijlstra (Intel) Link: https://lkml.kernel.org/r/20221114091833.1492575-1-cuigaosheng1@huawei.com --- kernel/events/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/events/core.c b/kernel/events/core.c index baa2997..baa6edf 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -13171,7 +13171,7 @@ inherit_event(struct perf_event *parent_event, return child_event; pmu_ctx = find_get_pmu_context(child_event->pmu, child_ctx, child_event); - if (!pmu_ctx) { + if (IS_ERR(pmu_ctx)) { free_event(child_event); return NULL; }