* [PATCH][next] arm64: kexec_file: Use struct_size() in kmalloc()
@ 2020-06-17 21:34 Gustavo A. R. Silva
2020-06-18 10:40 ` Will Deacon
0 siblings, 1 reply; 2+ messages in thread
From: Gustavo A. R. Silva @ 2020-06-17 21:34 UTC (permalink / raw)
To: Catalin Marinas, Will Deacon
Cc: linux-arm-kernel, linux-kernel, Gustavo A. R. Silva
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>
---
arch/arm64/kernel/machine_kexec_file.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/arch/arm64/kernel/machine_kexec_file.c b/arch/arm64/kernel/machine_kexec_file.c
index 522e6f517ec0..361a1143e09e 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;
--
2.27.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH][next] arm64: kexec_file: Use struct_size() in kmalloc()
2020-06-17 21:34 [PATCH][next] arm64: kexec_file: Use struct_size() in kmalloc() Gustavo A. R. Silva
@ 2020-06-18 10:40 ` Will Deacon
0 siblings, 0 replies; 2+ messages in thread
From: Will Deacon @ 2020-06-18 10:40 UTC (permalink / raw)
To: Catalin Marinas, Gustavo A. R. Silva
Cc: Will Deacon, linux-arm-kernel, linux-kernel, Gustavo A. R. Silva
On Wed, 17 Jun 2020 16:34:07 -0500, Gustavo A. R. Silva wrote:
> 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.
Applied to arm64 (for-next/fixes), thanks!
[1/1] arm64: kexec_file: Use struct_size() in kmalloc()
https://git.kernel.org/arm64/c/bf508ec95ca3
Cheers,
--
Will
https://fixes.arm64.dev
https://next.arm64.dev
https://will.arm64.dev
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-06-18 10:40 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-17 21:34 [PATCH][next] arm64: kexec_file: Use struct_size() in kmalloc() Gustavo A. R. Silva
2020-06-18 10:40 ` Will Deacon
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).