From: Greg Kroah-Hartman Date: Wed, 9 Feb 2022 13:13:49 +0000 (+0100) Subject: 5.15-stable patches X-Git-Tag: v4.9.301~12 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1264217d195b1a33218bcd6d72191fdb99c690db;p=thirdparty%2Fkernel%2Fstable-queue.git 5.15-stable patches added patches: arm64-add-cortex-a510-cpu-part-definition.patch moxart-fix-potential-use-after-free-on-remove-path.patch --- diff --git a/queue-5.15/arm64-add-cortex-a510-cpu-part-definition.patch b/queue-5.15/arm64-add-cortex-a510-cpu-part-definition.patch new file mode 100644 index 00000000000..cea072852ea --- /dev/null +++ b/queue-5.15/arm64-add-cortex-a510-cpu-part-definition.patch @@ -0,0 +1,44 @@ +From 53960faf2b731dd2f9ed6e1334634b8ba6286850 Mon Sep 17 00:00:00 2001 +From: Anshuman Khandual +Date: Tue, 25 Jan 2022 19:50:31 +0530 +Subject: arm64: Add Cortex-A510 CPU part definition + +From: Anshuman Khandual + +commit 53960faf2b731dd2f9ed6e1334634b8ba6286850 upstream. + +Add the CPU Partnumbers for the new Arm designs. + +Cc: Catalin Marinas +Cc: Will Deacon +Cc: Suzuki Poulose +Cc: linux-arm-kernel@lists.infradead.org +Cc: linux-kernel@vger.kernel.org +Reviewed-by: Suzuki K Poulose +Acked-by: Catalin Marinas +Signed-off-by: Anshuman Khandual +Link: https://lore.kernel.org/r/1643120437-14352-2-git-send-email-anshuman.khandual@arm.com +Signed-off-by: Mathieu Poirier +Signed-off-by: Greg Kroah-Hartman +--- + arch/arm64/include/asm/cputype.h | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/arch/arm64/include/asm/cputype.h ++++ b/arch/arm64/include/asm/cputype.h +@@ -73,6 +73,7 @@ + #define ARM_CPU_PART_CORTEX_A76 0xD0B + #define ARM_CPU_PART_NEOVERSE_N1 0xD0C + #define ARM_CPU_PART_CORTEX_A77 0xD0D ++#define ARM_CPU_PART_CORTEX_A510 0xD46 + + #define APM_CPU_PART_POTENZA 0x000 + +@@ -113,6 +114,7 @@ + #define MIDR_CORTEX_A76 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A76) + #define MIDR_NEOVERSE_N1 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_NEOVERSE_N1) + #define MIDR_CORTEX_A77 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A77) ++#define MIDR_CORTEX_A510 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A510) + #define MIDR_THUNDERX MIDR_CPU_MODEL(ARM_CPU_IMP_CAVIUM, CAVIUM_CPU_PART_THUNDERX) + #define MIDR_THUNDERX_81XX MIDR_CPU_MODEL(ARM_CPU_IMP_CAVIUM, CAVIUM_CPU_PART_THUNDERX_81XX) + #define MIDR_THUNDERX_83XX MIDR_CPU_MODEL(ARM_CPU_IMP_CAVIUM, CAVIUM_CPU_PART_THUNDERX_83XX) diff --git a/queue-5.15/moxart-fix-potential-use-after-free-on-remove-path.patch b/queue-5.15/moxart-fix-potential-use-after-free-on-remove-path.patch new file mode 100644 index 00000000000..8e77bb90134 --- /dev/null +++ b/queue-5.15/moxart-fix-potential-use-after-free-on-remove-path.patch @@ -0,0 +1,46 @@ +From bd2db32e7c3e35bd4d9b8bbff689434a50893546 Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman +Date: Thu, 27 Jan 2022 08:16:38 +0100 +Subject: moxart: fix potential use-after-free on remove path + +From: Greg Kroah-Hartman + +commit bd2db32e7c3e35bd4d9b8bbff689434a50893546 upstream. + +It was reported that the mmc host structure could be accessed after it +was freed in moxart_remove(), so fix this by saving the base register of +the device and using it instead of the pointer dereference. + +Cc: Ulf Hansson +Cc: Xiyu Yang +Cc: Xin Xiong +Cc: Xin Tan +Cc: Tony Lindgren +Cc: Yang Li +Cc: linux-mmc@vger.kernel.org +Cc: stable +Reported-by: whitehat002 +Signed-off-by: Greg Kroah-Hartman +Link: https://lore.kernel.org/r/20220127071638.4057899-1-gregkh@linuxfoundation.org +Signed-off-by: Ulf Hansson +Signed-off-by: Greg Kroah-Hartman +--- + drivers/mmc/host/moxart-mmc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/mmc/host/moxart-mmc.c ++++ b/drivers/mmc/host/moxart-mmc.c +@@ -705,12 +705,12 @@ static int moxart_remove(struct platform + if (!IS_ERR_OR_NULL(host->dma_chan_rx)) + dma_release_channel(host->dma_chan_rx); + mmc_remove_host(mmc); +- mmc_free_host(mmc); + + writel(0, host->base + REG_INTERRUPT_MASK); + writel(0, host->base + REG_POWER_CONTROL); + writel(readl(host->base + REG_CLOCK_CONTROL) | CLK_OFF, + host->base + REG_CLOCK_CONTROL); ++ mmc_free_host(mmc); + + return 0; + } diff --git a/queue-5.15/series b/queue-5.15/series new file mode 100644 index 00000000000..baa7af84779 --- /dev/null +++ b/queue-5.15/series @@ -0,0 +1,2 @@ +moxart-fix-potential-use-after-free-on-remove-path.patch +arm64-add-cortex-a510-cpu-part-definition.patch