5.15-stable patches

added patches:
	irqchip-gic-v3-its-prevent-double-free-on-error.patch

diff --git a/queue-5.15/irqchip-gic-v3-its-prevent-double-free-on-error.patch b/queue-5.15/irqchip-gic-v3-its-prevent-double-free-on-error.patch
new file mode 100644 (file)
index 0000000..e7239e3
--- /dev/null
+++ b/queue-5.15/irqchip-gic-v3-its-prevent-double-free-on-error.patch
@@ -0,0 +1,52 @@
+From c26591afd33adce296c022e3480dea4282b7ef91 Mon Sep 17 00:00:00 2001
+From: Guanrui Huang <guanrui.huang@linux.alibaba.com>
+Date: Thu, 18 Apr 2024 14:10:52 +0800
+Subject: irqchip/gic-v3-its: Prevent double free on error
+
+From: Guanrui Huang <guanrui.huang@linux.alibaba.com>
+
+commit c26591afd33adce296c022e3480dea4282b7ef91 upstream.
+
+The error handling path in its_vpe_irq_domain_alloc() causes a double free
+when its_vpe_init() fails after successfully allocating at least one
+interrupt. This happens because its_vpe_irq_domain_free() frees the
+interrupts along with the area bitmap and the vprop_page and
+its_vpe_irq_domain_alloc() subsequently frees the area bitmap and the
+vprop_page again.
+
+Fix this by unconditionally invoking its_vpe_irq_domain_free() which
+handles all cases correctly and by removing the bitmap/vprop_page freeing
+from its_vpe_irq_domain_alloc().
+
+[ tglx: Massaged change log ]
+
+Fixes: 7d75bbb4bc1a ("irqchip/gic-v3-its: Add VPE irq domain allocation/teardown")
+Signed-off-by: Guanrui Huang <guanrui.huang@linux.alibaba.com>
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+Reviewed-by: Marc Zyngier <maz@kernel.org>
+Reviewed-by: Zenghui Yu <yuzenghui@huawei.com>
+Cc: stable@vger.kernel.org
+Link: https://lore.kernel.org/r/20240418061053.96803-2-guanrui.huang@linux.alibaba.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/irqchip/irq-gic-v3-its.c |    9 ++-------
+ 1 file changed, 2 insertions(+), 7 deletions(-)
+
+--- a/drivers/irqchip/irq-gic-v3-its.c
++++ b/drivers/irqchip/irq-gic-v3-its.c
+@@ -4530,13 +4530,8 @@ static int its_vpe_irq_domain_alloc(stru
+               set_bit(i, bitmap);
+       }
+ 
+-      if (err) {
+-              if (i > 0)
+-                      its_vpe_irq_domain_free(domain, virq, i);
+-
+-              its_lpi_free(bitmap, base, nr_ids);
+-              its_free_prop_table(vprop_page);
+-      }
++      if (err)
++              its_vpe_irq_domain_free(domain, virq, i);
+ 
+       return err;
+ }

diff --git a/queue-5.15/series b/queue-5.15/series
index 378923e71bb515c33c1c6b665ac81b986ce67365..4d109f6a6dfd8267fdf282a9433d7c797a6cf1a0 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -59,3 +59,4 @@ cpu-re-enable-cpu-mitigations-by-default-for-x86-architectures.patch
 arm64-dts-rockchip-enable-internal-pull-up-for-q7_thrm-on-rk3399-puma.patch
 drm-amdgpu-sdma5.2-use-legacy-hdp-flush-for-sdma2-3.patch
 drm-amdgpu-fix-leak-when-gpu-memory-allocation-fails.patch
+irqchip-gic-v3-its-prevent-double-free-on-error.patch