diff options
| author | Gustavo A. R. Silva <gustavoars@kernel.org> | 2020-06-17 16:34:07 -0500 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2020-06-18 10:45:20 +0100 |
| commit | bf508ec95ca3b902f14bb311a7709e5cb57fbc49 (patch) | |
| tree | 9bcd0dd8bf711aed4f39fc044cbe1e1789fdf552 | |
| parent | 618e07865b7453d02410c1f3407c2d78a670eabb (diff) | |
| download | linux-uniphier-bf508ec95ca3b902f14bb311a7709e5cb57fbc49.tar.gz | |
arm64: kexec_file: Use struct_size() in kmalloc()
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 <gustavoars@kernel.org>
Link: https://lore.kernel.org/r/20200617213407.GA1385@embeddedor
Signed-off-by: Will Deacon <will@kernel.org>
| -rw-r--r-- | arch/arm64/kernel/machine_kexec_file.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm64/kernel/machine_kexec_file.c b/arch/arm64/kernel/machine_kexec_file.c index 522e6f517ec0d6..361a1143e09ee8 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; |