summaryrefslogtreecommitdiff
path: root/drivers/of
diff options
context:
space:
mode:
authorRik van Riel <riel@surriel.com>2023-08-17 20:57:59 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-08-30 17:11:06 +0300
commit091591f6e7c35fc2f0a74c9d044b0638a37b0f3f (patch)
tree99d3bd1b5578646deca5bf10e5d5fe140e673c99 /drivers/of
parenta7d172252bfad47d06a5dcf6fbb6d4ea85f4cedd (diff)
downloadlinux-091591f6e7c35fc2f0a74c9d044b0638a37b0f3f.tar.xz
mm,ima,kexec,of: use memblock_free_late from ima_free_kexec_buffer
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/of')
-rw-r--r--drivers/of/kexec.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/of/kexec.c b/drivers/of/kexec.c
index f26d2ba8a371..68278340cecf 100644
--- a/drivers/of/kexec.c
+++ b/drivers/of/kexec.c
@@ -184,7 +184,8 @@ int __init ima_free_kexec_buffer(void)
if (ret)
return ret;
- return memblock_phys_free(addr, size);
+ memblock_free_late(addr, size);
+ return 0;
}
#endif