From: Greg Kroah-Hartman Date: Fri, 21 Jul 2023 07:00:43 +0000 (+0200) Subject: 5.10-stable patches X-Git-Tag: v5.15.121~58 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3d27efcf8db5db428be1c6d7d5c060400c6da52d;p=thirdparty%2Fkernel%2Fstable-queue.git 5.10-stable patches added patches: misc-pci_endpoint_test-free-irqs-before-removing-the-device.patch misc-pci_endpoint_test-re-init-completion-for-every-test.patch --- diff --git a/queue-5.10/misc-pci_endpoint_test-free-irqs-before-removing-the-device.patch b/queue-5.10/misc-pci_endpoint_test-free-irqs-before-removing-the-device.patch new file mode 100644 index 00000000000..7b3b9264daf --- /dev/null +++ b/queue-5.10/misc-pci_endpoint_test-free-irqs-before-removing-the-device.patch @@ -0,0 +1,50 @@ +From f61b7634a3249d12b9daa36ffbdb9965b6f24c6c Mon Sep 17 00:00:00 2001 +From: Damien Le Moal +Date: Sat, 15 Apr 2023 11:35:39 +0900 +Subject: misc: pci_endpoint_test: Free IRQs before removing the device + +From: Damien Le Moal + +commit f61b7634a3249d12b9daa36ffbdb9965b6f24c6c upstream. + +In pci_endpoint_test_remove(), freeing the IRQs after removing the device +creates a small race window for IRQs to be received with the test device +memory already released, causing the IRQ handler to access invalid memory, +resulting in an oops. + +Free the device IRQs before removing the device to avoid this issue. + +Link: https://lore.kernel.org/r/20230415023542.77601-15-dlemoal@kernel.org +Fixes: e03327122e2c ("pci_endpoint_test: Add 2 ioctl commands") +Signed-off-by: Damien Le Moal +Signed-off-by: Lorenzo Pieralisi +Signed-off-by: Bjorn Helgaas +Reviewed-by: Manivannan Sadhasivam +Cc: stable@vger.kernel.org +Signed-off-by: Greg Kroah-Hartman +--- + drivers/misc/pci_endpoint_test.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +--- a/drivers/misc/pci_endpoint_test.c ++++ b/drivers/misc/pci_endpoint_test.c +@@ -935,6 +935,9 @@ static void pci_endpoint_test_remove(str + if (id < 0) + return; + ++ pci_endpoint_test_release_irq(test); ++ pci_endpoint_test_free_irq_vectors(test); ++ + misc_deregister(&test->miscdev); + kfree(misc_device->name); + kfree(test->name); +@@ -944,9 +947,6 @@ static void pci_endpoint_test_remove(str + pci_iounmap(pdev, test->bar[bar]); + } + +- pci_endpoint_test_release_irq(test); +- pci_endpoint_test_free_irq_vectors(test); +- + pci_release_regions(pdev); + pci_disable_device(pdev); + } diff --git a/queue-5.10/misc-pci_endpoint_test-re-init-completion-for-every-test.patch b/queue-5.10/misc-pci_endpoint_test-re-init-completion-for-every-test.patch new file mode 100644 index 00000000000..b678aed92c6 --- /dev/null +++ b/queue-5.10/misc-pci_endpoint_test-re-init-completion-for-every-test.patch @@ -0,0 +1,44 @@ +From fb620ae73b70c2f57b9d3e911fc24c024ba2324f Mon Sep 17 00:00:00 2001 +From: Damien Le Moal +Date: Sat, 15 Apr 2023 11:35:40 +0900 +Subject: misc: pci_endpoint_test: Re-init completion for every test + +From: Damien Le Moal + +commit fb620ae73b70c2f57b9d3e911fc24c024ba2324f upstream. + +The irq_raised completion used to detect the end of a test case is +initialized when the test device is probed, but never reinitialized again +before a test case. As a result, the irq_raised completion synchronization +is effective only for the first ioctl test case executed. Any subsequent +call to wait_for_completion() by another ioctl() call will immediately +return, potentially too early, leading to false positive failures. + +Fix this by reinitializing the irq_raised completion before starting a new +ioctl() test command. + +Link: https://lore.kernel.org/r/20230415023542.77601-16-dlemoal@kernel.org +Fixes: 2c156ac71c6b ("misc: Add host side PCI driver for PCI test function device") +Signed-off-by: Damien Le Moal +Signed-off-by: Lorenzo Pieralisi +Signed-off-by: Bjorn Helgaas +Reviewed-by: Manivannan Sadhasivam +Cc: stable@vger.kernel.org +Signed-off-by: Greg Kroah-Hartman +--- + drivers/misc/pci_endpoint_test.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/drivers/misc/pci_endpoint_test.c ++++ b/drivers/misc/pci_endpoint_test.c +@@ -727,6 +727,10 @@ static long pci_endpoint_test_ioctl(stru + struct pci_dev *pdev = test->pdev; + + mutex_lock(&test->mutex); ++ ++ reinit_completion(&test->irq_raised); ++ test->last_irq = -ENODATA; ++ + switch (cmd) { + case PCITEST_BAR: + bar = arg; diff --git a/queue-5.10/series b/queue-5.10/series index 443d0080239..63284886fc1 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -403,3 +403,5 @@ pci-rockchip-add-poll-and-timeout-to-wait-for-phy-plls-to-be-locked.patch pci-rockchip-fix-legacy-irq-generation-for-rk3399-pcie-endpoint-core.patch pci-rockchip-use-u32-variable-to-access-32-bit-registers.patch pci-rockchip-set-address-alignment-for-endpoint-mode.patch +misc-pci_endpoint_test-free-irqs-before-removing-the-device.patch +misc-pci_endpoint_test-re-init-completion-for-every-test.patch