Skip to content

Commit

Permalink
mm,ima,kexec,of: use memblock_free_late from ima_free_kexec_buffer
Browse files Browse the repository at this point in the history
commit f0362a2 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: fee3ff9 ("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>
  • Loading branch information
rikvanriel authored and gregkh committed Aug 30, 2023
1 parent c856ff4 commit 535cdce
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/of/kexec.c
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 535cdce

Please sign in to comment.