]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
mm,ima,kexec,of: use memblock_free_late from ima_free_kexec_buffer
authorRik van Riel <riel@surriel.com>
Thu, 17 Aug 2023 17:57:59 +0000 (13:57 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 30 Aug 2023 14:18:22 +0000 (16:18 +0200)
commit f0362a253606e2031f8d61c74195d4d6556e12a4 upstream.

The code calling ima_free_kexec_buffer runs long after the memblock
allocator has already been torn down, potentially resulting in a use
after free in memblock_isolate_range.

With KASAN or KFENCE, this use after free will result in a BUG
from the idle task, and a subsequent kernel panic.

Switch ima_free_kexec_buffer over to memblock_free_late to avoid
that issue.

Fixes: fee3ff99bc67 ("powerpc: Move arch independent ima kexec functions to drivers/of/kexec.c")
Cc: stable@kernel.org
Signed-off-by: Rik van Riel <riel@surriel.com>
Suggested-by: Mike Rappoport <rppt@kernel.org>
Link: https://lore.kernel.org/r/20230817135759.0888e5ef@imladris.surriel.com
Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Mike Rappoport (IBM) <rppt@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/of/kexec.c

index 52bb68fb22169ac212baced02c51dcd539dfbbdd..3a07cc58e7d7a408dc6fc08b7f3051aa6df34e13 100644 (file)
@@ -187,8 +187,8 @@ int ima_free_kexec_buffer(void)
        if (ret)
                return ret;
 
-       return memblock_free(addr, size);
-
+       memblock_free_late(addr, size);
+       return 0;
 }
 
 /**