From: Alexander Shishkin <alexander.shishkin@linux.intel.com>
To: Bjorn Helgaas <bhelgaas@google.com>,
Thomas Gleixner <tglx@linutronix.de>,
linux-pci@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, Marc Zyngier <maz@kernel.org>,
darwi@linutronix.de, elena.reshetova@intel.com,
kirill.shutemov@linux.intel.com,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Mika Westerberg <mika.westerberg@linux.intel.com>,
stable@vger.kernel.org
Subject: [PATCH 1/2] PCI/MSI: Cache the MSIX table size
Date: Thu, 19 Jan 2023 19:06:32 +0200 [thread overview]
Message-ID: <20230119170633.40944-2-alexander.shishkin@linux.intel.com> (raw)
In-Reply-To: <20230119170633.40944-1-alexander.shishkin@linux.intel.com>
A malicious device can change its MSIX table size between the table
ioremap() and subsequent accesses, resulting in a kernel page fault in
pci_write_msg_msix().
To avoid this, cache the table size observed at the moment of table
ioremap() and use the cached value. This, however, does not help drivers
that peek at the PCIE_MSIX_FLAGS register directly.
Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Cc: stable@vger.kernel.org
---
drivers/pci/msi/api.c | 7 ++++++-
drivers/pci/msi/msi.c | 2 +-
include/linux/pci.h | 1 +
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/drivers/pci/msi/api.c b/drivers/pci/msi/api.c
index b8009aa11f3c..617ea1256487 100644
--- a/drivers/pci/msi/api.c
+++ b/drivers/pci/msi/api.c
@@ -75,8 +75,13 @@ int pci_msix_vec_count(struct pci_dev *dev)
if (!dev->msix_cap)
return -EINVAL;
+ if (dev->flags_qsize)
+ return dev->flags_qsize;
+
pci_read_config_word(dev, dev->msix_cap + PCI_MSIX_FLAGS, &control);
- return msix_table_size(control);
+ dev->flags_qsize = msix_table_size(control);
+
+ return dev->flags_qsize;
}
EXPORT_SYMBOL(pci_msix_vec_count);
diff --git a/drivers/pci/msi/msi.c b/drivers/pci/msi/msi.c
index 1f716624ca56..d50cd45119f1 100644
--- a/drivers/pci/msi/msi.c
+++ b/drivers/pci/msi/msi.c
@@ -715,7 +715,7 @@ static int msix_capability_init(struct pci_dev *dev, struct msix_entry *entries,
pci_read_config_word(dev, dev->msix_cap + PCI_MSIX_FLAGS, &control);
/* Request & Map MSI-X table region */
- tsize = msix_table_size(control);
+ tsize = pci_msix_vec_count(dev);
dev->msix_base = msix_map_region(dev, tsize);
if (!dev->msix_base) {
ret = -ENOMEM;
diff --git a/include/linux/pci.h b/include/linux/pci.h
index adffd65e84b4..2e1a72a2139d 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -352,6 +352,7 @@ struct pci_dev {
u8 rom_base_reg; /* Config register controlling ROM */
u8 pin; /* Interrupt pin this device uses */
u16 pcie_flags_reg; /* Cached PCIe Capabilities Register */
+ u16 flags_qsize; /* Cached MSIX table size */
unsigned long *dma_alias_mask;/* Mask of enabled devfn aliases */
struct pci_driver *driver; /* Driver bound to this device */
--
2.39.0
next prev parent reply other threads:[~2023-01-19 17:10 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-19 17:06 [PATCH 0/2] PCI/MSI: Hardening fixes Alexander Shishkin
2023-01-19 17:06 ` Alexander Shishkin [this message]
2023-01-22 9:00 ` [PATCH 1/2] PCI/MSI: Cache the MSIX table size Leon Romanovsky
2023-01-22 10:57 ` Marc Zyngier
2023-01-22 15:34 ` David Laight
2023-01-24 11:59 ` Alexander Shishkin
2023-01-22 10:57 ` Greg KH
2023-01-23 10:22 ` Jonathan Cameron
2023-01-24 11:52 ` Alexander Shishkin
2023-01-24 12:10 ` Leon Romanovsky
2023-01-24 12:42 ` Alexander Shishkin
2023-01-24 12:59 ` Leon Romanovsky
2023-01-24 15:28 ` Alexander Shishkin
2023-01-24 15:32 ` Greg KH
2023-01-25 12:33 ` Reshetova, Elena
2023-01-19 17:06 ` [PATCH 2/2] PCI/MSI: Validate device supplied MSI table offset and size Alexander Shishkin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230119170633.40944-2-alexander.shishkin@linux.intel.com \
--to=alexander.shishkin@linux.intel.com \
--cc=bhelgaas@google.com \
--cc=darwi@linutronix.de \
--cc=elena.reshetova@intel.com \
--cc=kirill.shutemov@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=maz@kernel.org \
--cc=mika.westerberg@linux.intel.com \
--cc=stable@vger.kernel.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).