5.15-stable patches

added patches:
	memblock-use-kfree-to-release-kmalloced-memblock-regions.patch

diff --git a/queue-5.15/memblock-use-kfree-to-release-kmalloced-memblock-regions.patch b/queue-5.15/memblock-use-kfree-to-release-kmalloced-memblock-regions.patch
new file mode 100644 (file)
index 0000000..dbaf0c4
--- /dev/null
+++ b/queue-5.15/memblock-use-kfree-to-release-kmalloced-memblock-regions.patch
@@ -0,0 +1,46 @@
+From c94afc46cae7ad41b2ad6a99368147879f4b0e56 Mon Sep 17 00:00:00 2001
+From: Miaohe Lin <linmiaohe@huawei.com>
+Date: Thu, 17 Feb 2022 22:53:27 +0800
+Subject: memblock: use kfree() to release kmalloced memblock regions
+
+From: Miaohe Lin <linmiaohe@huawei.com>
+
+commit c94afc46cae7ad41b2ad6a99368147879f4b0e56 upstream.
+
+memblock.{reserved,memory}.regions may be allocated using kmalloc() in
+memblock_double_array(). Use kfree() to release these kmalloced regions
+indicated by memblock_{reserved,memory}_in_slab.
+
+Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
+Fixes: 3010f876500f ("mm: discard memblock data later")
+Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ mm/memblock.c |   10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+--- a/mm/memblock.c
++++ b/mm/memblock.c
+@@ -366,14 +366,20 @@ void __init memblock_discard(void)
+               addr = __pa(memblock.reserved.regions);
+               size = PAGE_ALIGN(sizeof(struct memblock_region) *
+                                 memblock.reserved.max);
+-              __memblock_free_late(addr, size);
++              if (memblock_reserved_in_slab)
++                      kfree(memblock.reserved.regions);
++              else
++                      __memblock_free_late(addr, size);
+       }
+ 
+       if (memblock.memory.regions != memblock_memory_init_regions) {
+               addr = __pa(memblock.memory.regions);
+               size = PAGE_ALIGN(sizeof(struct memblock_region) *
+                                 memblock.memory.max);
+-              __memblock_free_late(addr, size);
++              if (memblock_memory_in_slab)
++                      kfree(memblock.memory.regions);
++              else
++                      __memblock_free_late(addr, size);
+       }
+ 
+       memblock_memory = NULL;

diff --git a/queue-5.15/series b/queue-5.15/series
index 4d6a9850305cd7a6fd094140eaf46391060d0d34..f254ab8edfa25046331d7a25727fe14cc5460a63 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -134,3 +134,4 @@ tty-n_gsm-fix-deadlock-in-gsmtty_open.patch
 pinctrl-fix-loop-in-k210_pinconf_get_drive.patch
 pinctrl-k210-fix-bias-pull-up.patch
 gpio-tegra186-fix-chip_data-type-confusion.patch
+memblock-use-kfree-to-release-kmalloced-memblock-regions.patch