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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id EF17CC87FCB for ; Wed, 6 Aug 2025 20:08:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Reply-To:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type:Cc:To: From:Subject:Message-ID:References:Mime-Version:In-Reply-To:Date: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=tP9GWyHDKyhyNham1AJeXmzoVBEhNFAEzN5Uklpk9I0=; b=VEFi1r1ZL5i7cy5zZrmr/V7Amu ACDEx9g5KwzHcFNcOnZ5r5fsKxjzzqax8LOCr1ngt9AL/Pjp6pS0/Nz+0sBmNqw1wRBzzdVdZost5 P1Qevb8r+70gD92xXDxhFv9K4OMdudxN/M7dozf4RIf6pZLY5q1KT3ypWl0pOeqYO8iEkwoSA9a5y j25E+CPUhepCyIYAyr3KMB1XuWTU/EVf7iRS7YHqwsMFly35qZc15PdtNTLN2QhU7AxZwnWkkCazF je77kGpNWDLdwYyDGqz51pJaX+7ZkejxrYMsSCKvsCJDZIvvjRxUBNB0x+TRV+gOWzXPnGTlW3TkU 89WT+28w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1ujkRH-0000000GKWm-3ibM; Wed, 06 Aug 2025 20:08:43 +0000 Received: from mail-pg1-x549.google.com ([2607:f8b0:4864:20::549]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1ujkGV-0000000GG5x-0Xoz for linux-arm-kernel@lists.infradead.org; Wed, 06 Aug 2025 19:57:36 +0000 Received: by mail-pg1-x549.google.com with SMTP id 41be03b00d2f7-b3f33295703so236422a12.1 for ; Wed, 06 Aug 2025 12:57:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1754510254; x=1755115054; darn=lists.infradead.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=tP9GWyHDKyhyNham1AJeXmzoVBEhNFAEzN5Uklpk9I0=; b=VmByWW2FsMtZOhK366pwG9UV6CLu82P0XWQvhu7+9QRESrLZrY5XsCF2YCWfqk3Uz5 MeEI3bJFl6Ozs8ogutd1MDB6eVjvn+Ka6iv1chhC7GSA1zXaxqb8Hxw6T+NfGicbvRmH NrBxYz6Zgajx/fcWGJYW0nL3gkrX34Bl39v4jwHyEkv/FnxkeQg16vtoNa8/MIOjgzgy x63gCjAQh2Kjx5bBuhRbEM3djTx9zXG9uGfbb/ss2dF90PD0tpESUTcuIP+mq7MyOc0l yLel0tlOX05zhHMxIxXCIdkb2JVOtasRKaIoV4vHDBYk78598USbDM+OSUJA+Gx1nwvX Hmgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754510254; x=1755115054; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=tP9GWyHDKyhyNham1AJeXmzoVBEhNFAEzN5Uklpk9I0=; b=rSzspWYxD8ySiJv3VyolDqVs6sR+LGS76+ZNqLCIrBEz+q2ufNhDubtMHHblXf3Zwr Ik0UBd7RDPoFh/RRhpkaR3XDN0BCDFPqTwzkhFYwWpA0ejNFSARggeCRgZGlC9lDfefg KhYsWazAooad06s3yM42hg8XkV/T7OHbvVOcPvN3DL7RuJQ2EJQHytK2xu+pmln+ZP0E 1FJdstKjNJkI4BAuEphX5ktJHxHZxtAFISHM4/n8zXweMAR2aWreoxWlmTdO8o4HG6Nb +yVZobV3nmwOLMoGEtEyrybN6Mk/T+DK51vfCs0eYU14wMGQqWJ6c0emabJ85itJ6Jat 3S7Q== X-Gm-Message-State: AOJu0YwGRJBm4sdrVFlIOLUlmEIB8Bd0BrWpjK5NE2hQIspt15hnhEIz IeRgLkDD44Br8n8F8D7S9V3KWjh/Sm0HxAI+sQCS2z2ZdtsUtvVBTJr1kbbW67VVUzSOGtLy1Lv nZAzP+g== X-Google-Smtp-Source: AGHT+IE0CEB3xtAs9hI54+H7B1IyMBLcepknW0FCY+2mxv/eXxKsKgLhnBmg0Z6EMAhWWlTkD97yQMZQQo8= X-Received: from pgg21.prod.google.com ([2002:a05:6a02:4d95:b0:b42:3ec5:d919]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:5493:b0:220:aea6:2154 with SMTP id adf61e73a8af0-2403125bcacmr7040722637.17.1754510253905; Wed, 06 Aug 2025 12:57:33 -0700 (PDT) Date: Wed, 6 Aug 2025 12:56:25 -0700 In-Reply-To: <20250806195706.1650976-1-seanjc@google.com> Mime-Version: 1.0 References: <20250806195706.1650976-1-seanjc@google.com> X-Mailer: git-send-email 2.50.1.565.gc32cd1483b-goog Message-ID: <20250806195706.1650976-4-seanjc@google.com> Subject: [PATCH v5 03/44] perf: Move security_perf_event_free() call to __free_event() From: Sean Christopherson To: Marc Zyngier , Oliver Upton , Tianrui Zhao , Bibo Mao , Huacai Chen , Anup Patel , Paul Walmsley , Palmer Dabbelt , Albert Ou , Xin Li , "H. Peter Anvin" , Andy Lutomirski , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Sean Christopherson , Paolo Bonzini Cc: linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, kvm@vger.kernel.org, loongarch@lists.linux.dev, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Kan Liang , Yongwei Ma , Mingwei Zhang , Xiong Zhang , Sandipan Das , Dapeng Mi Content-Type: text/plain; charset="UTF-8" X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250806_125735_191308_619CB1DF X-CRM114-Status: GOOD ( 14.28 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Sean Christopherson Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Move the freeing of any security state associated with a perf event from _free_event() to __free_event(), i.e. invoke security_perf_event_free() in the error paths for perf_event_alloc(). This will allow adding potential error paths in perf_event_alloc() that can occur after allocating security state. Note, kfree() and thus security_perf_event_free() is a nop if event->security is NULL, i.e. calling security_perf_event_free() even if security_perf_event_alloc() fails or is never reached is functionality ok. Signed-off-by: Sean Christopherson --- kernel/events/core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/events/core.c b/kernel/events/core.c index 3a98e11d8efc..1753a97638a3 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -5596,6 +5596,8 @@ static void __free_event(struct perf_event *event) { struct pmu *pmu = event->pmu; + security_perf_event_free(event); + if (event->attach_state & PERF_ATTACH_CALLCHAIN) put_callchain_buffers(); @@ -5659,8 +5661,6 @@ static void _free_event(struct perf_event *event) unaccount_event(event); - security_perf_event_free(event); - if (event->rb) { /* * Can happen when we close an event with re-directed output. -- 2.50.1.565.gc32cd1483b-goog