From nobody Mon Apr 13 18:37:03 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DAF28C433FE for ; Wed, 16 Nov 2022 09:14:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233118AbiKPJOh (ORCPT ); Wed, 16 Nov 2022 04:14:37 -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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the perf/core branch of tip: Commit-ID: c55bfbb3ebce4e0956972f02b82673950ad1a2d2 Gitweb: https://git.kernel.org/tip/c55bfbb3ebce4e0956972f02b82673950= ad1a2d2 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@huawe= i.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; =20 pmu_ctx =3D 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; }