From nobody Tue Jun 30 09:25:01 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 749AAC433F5 for ; Fri, 21 Jan 2022 01:19:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239700AbiAUBTC (ORCPT ); Thu, 20 Jan 2022 20:19:02 -0500 Received: from Galois.linutronix.de ([193.142.43.55]:52782 "EHLO galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235197AbiAUBTA (ORCPT ); Thu, 20 Jan 2022 20:19:00 -0500 Date: Fri, 21 Jan 2022 01:18:57 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1642727938; 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=63eM+6UYuulfg+6WfwmqCNiumtTO6pPuHF2o3o8YG7o=; b=r+kPgYH6ASn2GjJz3cXSdDsJUyoY4m1TAAaFtbnQGnnFECaYKtCngAzfbDx1p35XQ/drPd bcwaIJ2/vW0vcRUUZmExQ8XVvV2XFcBR+9zGiLYke6VDhMnKdjmqQJseJY8EPwC6QLVs+M dRDj31U/UDuye5jJ7MUyWMubwfCVBCxdH20252EyESKj/emK1YYdLIJu2Ns81Q/HMi4N5Y cqIUuC5vBOACCNS8uYtwjoOXI6dVAZqv2C4EX9Oc4KUDR1apgfLUA4sExDw53aKHOP447M qr5J6GckbGFMc1IN1DRKYQ1a9GVXJYTlNLZcHy1Vi7OITJwbJ2EASX1UmOKyTg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1642727938; 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=63eM+6UYuulfg+6WfwmqCNiumtTO6pPuHF2o3o8YG7o=; b=Sbncv9byds/c2MR++Jcrd4QRKpO6SlfXrqmXBjK7hav6gZCoVC+kF+//R59efSFzRK+1PN JdSHNh6/IhOS7IAg== From: "tip-bot2 for Thomas Gleixner" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: irq/urgent] PCI/MSI: Prevent UAF in error path Cc: Tong Zhang , Thomas Gleixner , Bjorn Helgaas , x86@kernel.org, linux-kernel@vger.kernel.org, maz@kernel.org In-Reply-To: <87r1938vbn.ffs@tglx> References: <87r1938vbn.ffs@tglx> MIME-Version: 1.0 Message-ID: <164272793734.16921.6900414168494720740.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 irq/urgent branch of tip: Commit-ID: a0af3d1104f752b6d0dba71788e3fddd67c857a7 Gitweb: https://git.kernel.org/tip/a0af3d1104f752b6d0dba71788e3fddd6= 7c857a7 Author: Thomas Gleixner AuthorDate: Wed, 19 Jan 2022 18:54:52 +01:00 Committer: Thomas Gleixner CommitterDate: Fri, 21 Jan 2022 02:14:46 +01:00 PCI/MSI: Prevent UAF in error path When the core MSI allocation fails, then the PCI/MSI code uses an already freed MSI descriptor to unmask the MSI mask register in order to bring it b= ack into reset state. Remove MSI_FLAG_FREE_MSI_DESCS from the PCI/MSI irqdomain flags and let the PCI/MSI code free the MSI descriptors after usage. Fixes: 0f62d941acf9 ("genirq/msi: Provide msi_domain_alloc/free_irqs_descs_= locked()") Reported-by: Tong Zhang Signed-off-by: Thomas Gleixner Tested-by: Tong Zhang Acked-by: Bjorn Helgaas Link: https://lore.kernel.org/r/87r1938vbn.ffs@tglx --- drivers/pci/msi/irqdomain.c | 4 ++-- drivers/pci/msi/legacy.c | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/pci/msi/irqdomain.c b/drivers/pci/msi/irqdomain.c index 0d63541..e9cf318 100644 --- a/drivers/pci/msi/irqdomain.c +++ b/drivers/pci/msi/irqdomain.c @@ -28,6 +28,7 @@ void pci_msi_teardown_msi_irqs(struct pci_dev *dev) msi_domain_free_irqs_descs_locked(domain, &dev->dev); else pci_msi_legacy_teardown_msi_irqs(dev); + msi_free_msi_descs(&dev->dev); } =20 /** @@ -171,8 +172,7 @@ struct irq_domain *pci_msi_create_irq_domain(struct fwn= ode_handle *fwnode, if (info->flags & MSI_FLAG_USE_DEF_CHIP_OPS) pci_msi_domain_update_chip_ops(info); =20 - info->flags |=3D MSI_FLAG_ACTIVATE_EARLY | MSI_FLAG_DEV_SYSFS | - MSI_FLAG_FREE_MSI_DESCS; + info->flags |=3D MSI_FLAG_ACTIVATE_EARLY | MSI_FLAG_DEV_SYSFS; if (IS_ENABLED(CONFIG_GENERIC_IRQ_RESERVATION_MODE)) info->flags |=3D MSI_FLAG_MUST_REACTIVATE; =20 diff --git a/drivers/pci/msi/legacy.c b/drivers/pci/msi/legacy.c index cdbb468..db761ad 100644 --- a/drivers/pci/msi/legacy.c +++ b/drivers/pci/msi/legacy.c @@ -77,5 +77,4 @@ void pci_msi_legacy_teardown_msi_irqs(struct pci_dev *dev) { msi_device_destroy_sysfs(&dev->dev); arch_teardown_msi_irqs(dev); - msi_free_msi_descs(&dev->dev); }