diff --git a/blacklist.conf b/blacklist.conf index 951dd46..d08777f 100644 --- a/blacklist.conf +++ b/blacklist.conf @@ -1459,3 +1459,4 @@ e5242861ec6a0bce25b4cd10af0fc8a508fd067d # misattributed, only needed due to 188 b59f2f2b865cedd6d1641394b9cd84399bd738ff # cosmetic c7a75d07827a1f33d566e18e6098379cc2a0c2b2 # pci:xgene: caused a regression (bsc#1195352) 2cbc61a1b1665c84282dbf2b1747ffa0b6248639 # Needs another change to expose bug +83dbf898a2d45289be875deb580e93050ba67529 # pci:msi: caused a regression (bsc#1196403) diff --git a/patches.suse/PCI-MSI-Mask-MSI-X-vectors-only-on-success.patch b/patches.suse/PCI-MSI-Mask-MSI-X-vectors-only-on-success.patch deleted file mode 100644 index 887c0d9..0000000 --- a/patches.suse/PCI-MSI-Mask-MSI-X-vectors-only-on-success.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 83dbf898a2d45289be875deb580e93050ba67529 Mon Sep 17 00:00:00 2001 -From: Stefan Roese -Date: Tue, 14 Dec 2021 12:49:32 +0100 -Subject: [PATCH] PCI/MSI: Mask MSI-X vectors only on success -Mime-version: 1.0 -Content-type: text/plain; charset=UTF-8 -Content-transfer-encoding: 8bit -Git-commit: 83dbf898a2d45289be875deb580e93050ba67529 -Patch-mainline: v5.16-rc6 -References: git-fixes - -Masking all unused MSI-X entries is done to ensure that a crash kernel -starts from a clean slate, which correponds to the reset state of the -device as defined in the PCI-E specificion 3.0 and later: - - Vector Control for MSI-X Table Entries - -------------------------------------- - - "00: Mask bit: When this bit is set, the function is prohibited from - sending a message using this MSI-X Table entry. - ... - This bit’s state after reset is 1 (entry is masked)." - -A Marvell NVME device fails to deliver MSI interrupts after trying to -enable MSI-X interrupts due to that masking. It seems to take the MSI-X -mask bits into account even when MSI-X is disabled. - -While not specification compliant, this can be cured by moving the masking -into the success path, so that the MSI-X table entries stay in device reset -state when the MSI-X setup fails. - -[ tglx: Move it into the success path, add comment and amend changelog ] - -Fixes: aa8092c1d1f1 ("PCI/MSI: Mask all unused MSI-X entries") -Signed-off-by: Stefan Roese -Signed-off-by: Thomas Gleixner -Cc: linux-pci@vger.kernel.org -Cc: Bjorn Helgaas -Cc: Michal Simek -Cc: Marek Vasut -Cc: stable@vger.kernel.org -Link: https://lore.kernel.org/r/20211210161025.3287927-1-sr@denx.de -Acked-by: Takashi Iwai - ---- - drivers/pci/msi.c | 13 ++++++++++--- - 1 file changed, 10 insertions(+), 3 deletions(-) - -diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c -index 48e3f4e47b29..6748cf9d7d90 100644 ---- a/drivers/pci/msi.c -+++ b/drivers/pci/msi.c -@@ -722,9 +722,6 @@ static int msix_capability_init(struct pci_dev *dev, struct msix_entry *entries, - goto out_disable; - } - -- /* Ensure that all table entries are masked. */ -- msix_mask_all(base, tsize); -- - ret = msix_setup_entries(dev, base, entries, nvec, affd); - if (ret) - goto out_disable; -@@ -751,6 +748,16 @@ static int msix_capability_init(struct pci_dev *dev, struct msix_entry *entries, - /* Set MSI-X enabled bits and unmask the function */ - pci_intx_for_msi(dev, 0); - dev->msix_enabled = 1; -+ -+ /* -+ * Ensure that all table entries are masked to prevent -+ * stale entries from firing in a crash kernel. -+ * -+ * Done late to deal with a broken Marvell NVME device -+ * which takes the MSI-X mask bits into account even -+ * when MSI-X is disabled, which prevents MSI delivery. -+ */ -+ msix_mask_all(base, tsize); - pci_msix_clear_and_set_ctrl(dev, PCI_MSIX_FLAGS_MASKALL, 0); - - pcibios_free_irq(dev); --- -2.31.1 - diff --git a/patches.suse/lib-iov_iter-initialize-flags-in-new-pipe_buffer.patch b/patches.suse/lib-iov_iter-initialize-flags-in-new-pipe_buffer.patch index 0c04f25..036b319 100644 --- a/patches.suse/lib-iov_iter-initialize-flags-in-new-pipe_buffer.patch +++ b/patches.suse/lib-iov_iter-initialize-flags-in-new-pipe_buffer.patch @@ -5,7 +5,7 @@ Subject: [PATCH] lib/iov_iter: initialize "flags" in new pipe_buffer Git-commit: 9d2231c5d74e13b2a0546fee6737ee4446017903 Alt-commit: 87c575d2a238febe8a04241008f18252fe5d093d Patch-mainline: v5.17-rc6 -References: bsc#1196584 +References: CVE-2022-0847 bsc#1196584 commit 9d2231c5d74e13b2a0546fee6737ee4446017903 upstream. diff --git a/series.conf b/series.conf index 98d0989..9b3dae7 100644 --- a/series.conf +++ b/series.conf @@ -53655,7 +53655,6 @@ patches.suse/USB-NO_LPM-quirk-Lenovo-USB-C-to-Ethernet-Adapher-RT.patch patches.suse/USB-serial-cp210x-fix-CP2105-GPIO-registration.patch patches.suse/USB-serial-option-add-Telit-FN990-compositions.patch - patches.suse/PCI-MSI-Mask-MSI-X-vectors-only-on-success.patch patches.suse/PCI-MSI-Clear-PCI_MSIX_FLAGS_MASKALL-on-error.patch patches.suse/xen-blkfront-harden-blkfront-against-event-channel-s.patch patches.suse/xen-netfront-harden-netfront-against-event-channel-s.patch