From mboxrd@z Thu Jan 1 00:00:00 1970 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 A6FE8C4332F for ; Mon, 6 Nov 2023 13:21:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232444AbjKFNVB (ORCPT ); Mon, 6 Nov 2023 08:21:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38166 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232427AbjKFNU6 (ORCPT ); Mon, 6 Nov 2023 08:20:58 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6E04ED47 for ; Mon, 6 Nov 2023 05:20:51 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AF868C433C9; Mon, 6 Nov 2023 13:20:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1699276851; bh=kMvcXWoUvYglUzsMulqvqZSkIDhAzugx3HwxsKDPZow=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zutbimqrUv0j1E5oxzofOJk/2LezRaoEvCoSMvY//qxe5ynTbszS68TEtKLn8Lrm1 H71BixjcrotX4Heus7qHOcAaBuG/Jjs/+GgJPKtM4cPxZObekiiv5KKUyPaHC8Z3SJ O0TS7aOIza+sr7vTNFvAOc0yyl0fFh5+3O/YNJtc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Dan Carpenter , "Peter Zijlstra (Intel)" , Ingo Molnar Subject: [PATCH 5.4 29/74] perf/core: Fix potential NULL deref Date: Mon, 6 Nov 2023 14:03:49 +0100 Message-ID: <20231106130302.726944825@linuxfoundation.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231106130301.687882731@linuxfoundation.org> References: <20231106130301.687882731@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 5.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Peter Zijlstra commit a71ef31485bb51b846e8db8b3a35e432cc15afb5 upstream. Smatch is awesome. Fixes: 32671e3799ca ("perf: Disallow mis-matched inherited group reads") Reported-by: Dan Carpenter Signed-off-by: Peter Zijlstra (Intel) Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman --- kernel/events/core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -12015,7 +12015,8 @@ static int inherit_group(struct perf_eve !perf_get_aux_event(child_ctr, leader)) return -EINVAL; } - leader->group_generation = parent_event->group_generation; + if (leader) + leader->group_generation = parent_event->group_generation; return 0; }