kexec_file: Use array_size() helper in memcpy()
Subsystems (3)
PATCH 1/1 kexec_file: Use array_size() helper in memcpy()
Use array_size() instead of the open-coded version in memcpy(). These sorts of multiplication factors need to be wrapped in array_size().
Also, while there, use the preferred form for passing a size of a struct. The alternative form where struct name is spelled out hurts readability and introduces an opportunity for a bug when the pointer variable type is changed but the corresponding sizeof that is passed as argument is not.
This issue was found with the help of Coccinelle and, audited and fixed manually.
Addresses-KSPP-ID: https://github.com/KSPP/linux/issues/83
--- kernel/kexec_file.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/kexec_file.c +2 -2
@@ -910,11 +910,11 @@ static int kexec_purgatory_setup_sechdrs(struct purgatory_info *pi,* The section headers in kexec_purgatory are read-only. In order to * have them modifiable make a temporary copy. */ - sechdrs =vzalloc (array_size (sizeof (Elf_Shdr), pi->ehdr->e_shnum)); + sechdrs =vzalloc (array_size (sizeof (*sechdrs), pi->ehdr->e_shnum));if (!sechdrs)return -ENOMEM ;memcpy (sechdrs, (void *)pi->ehdr + pi->ehdr->e_shoff, - pi->ehdr->e_shnum *sizeof (Elf_Shdr)); +array_size (sizeof (*sechdrs), pi->ehdr->e_shnum)); pi->sechdrs = sechdrs; offset =0 ;
Signature · 7 lines
2.27.0 _______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec
Quoted 8 lines · Gustavo A. R. Silva
Use
array_size()instead of the open-coded version inmemcpy(). These sorts of multiplication factors need to be wrapped inarray_size().Also, while there, use the preferred form for passing a size of a struct. The alternative form where struct name is spelled out hurts readability and introduces an opportunity for a bug when the pointer variable type is changed but the corresponding sizeof that is passed as argument is not.
Quoted 5 lines
This issue was found with the help of Coccinelle and, audited and fixed manually.
Addresses-KSPP-ID: https://github.com/KSPP/linux/issues/83
Signed-off-by Gustavo A. R. Silva <[email protected]>
Signature · 6 lines
Kees Cook _______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec