arm64: kexec_file: Use struct_size() in kmalloc()

bf508ec9 · Gustavo A. R. Silva <[email protected]> · 2020-06-17 16:34:07 -05:00

Make use of the struct_size() helper instead of an open-coded version
in order to avoid any potential type mistakes.

This code was detected with the help of Coccinelle and, audited and
fixed manually.

Signed-off-by: Gustavo A. R. Silva <[email protected]>
Link: https://lore.kernel.org/r/20200617213407.GA1385@embeddedor
Signed-off-by: Will Deacon <[email protected]>

Commit: bf508ec95ca3b902f14bb311a7709e5cb57fbc49
Parents: 618e0786

Changes

1 files changed · +1 −2

File	Status	Add	Del	Content
arch/arm64/kernel/machine_kexec_file.c	modified	+1	−2	View file

arch/arm64/kernel/machine_kexec_file.c

View file

diff --git a/arch/arm64/kernel/machine_kexec_file.c b/arch/arm64/kernel/machine_kexec_file.c
index 522e6f5..361a114 100644
--- a/arch/arm64/kernel/machine_kexec_file.c
+++ b/arch/arm64/kernel/machine_kexec_file.c
@@ -219,8 +219,7 @@ static int prepare_elf_headers(void **addr, unsigned long *sz)
 					MEMBLOCK_NONE, &start, &end, NULL)
 		nr_ranges++;
 
-	cmem = kmalloc(sizeof(struct crash_mem) +
-			sizeof(struct crash_mem_range) * nr_ranges, GFP_KERNEL);
+	cmem = kmalloc(struct_size(cmem, ranges, nr_ranges), GFP_KERNEL);
 	if (!cmem)
 		return -ENOMEM;
 