Merge tag 'fixes-2022-02-26' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock

Pull memblock fix from Mike Rapoport:
 "Use kfree() to release kmalloced memblock regions

  memblock.{reserved,memory}.regions may be allocated using kmalloc()
  in memblock_double_array(). Use kfree() to release these kmalloced
  regions"

* tag 'fixes-2022-02-26' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock:
  memblock: use kfree() to release kmalloced memblock regions

mm/memblock.c

@@ -366,6 +366,9 @@ void __init memblock_discard(void)
 		addr = __pa(memblock.reserved.regions);
 		size = PAGE_ALIGN(sizeof(struct memblock_region) *
 				  memblock.reserved.max);
+		if (memblock_reserved_in_slab)
+			kfree(memblock.reserved.regions);
+		else
 			memblock_free_late(addr, size);
 	}
 
@@ -373,6 +376,9 @@ void __init memblock_discard(void)
 		addr = __pa(memblock.memory.regions);
 		size = PAGE_ALIGN(sizeof(struct memblock_region) *
 				  memblock.memory.max);
+		if (memblock_memory_in_slab)
+			kfree(memblock.memory.regions);
+		else
 			memblock_free_late(addr, size);
 	}