ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 12:43:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

binfmt: Use struct_size()

Browse Source 
Use struct_size() instead of hand-writing it. It is less verbose, more
robust and more informative.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Acked-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/53150beae5dc04dac513dba391a2e4ae8696a7f3.1685290790.git.christophe.jaillet@wanadoo.fr
This commit is contained in:
Christophe JAILLET
2023-05-28 18:20:24 +02:00
committed by Kees Cook
parent 60592fb6b6
commit e6302d5a28
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fs/binfmt_elf_fdpic.c
View File

@@ -748,7 +748,6 @@ static int elf_fdpic_map_file(struct elf_fdpic_params *params,
struct elf32_phdr *phdr; struct elf32_phdr *phdr;
unsigned long load_addr, stop; unsigned long load_addr, stop;
unsigned nloads, tmp; unsigned nloads, tmp;
size_t size;
int loop, ret; int loop, ret;
/* allocate a load map table */ /* allocate a load map table */
@@ -760,8 +759,7 @@ static int elf_fdpic_map_file(struct elf_fdpic_params *params,
if (nloads == 0) if (nloads == 0)
return -ELIBBAD; return -ELIBBAD;
size = sizeof(*loadmap) + nloads * sizeof(*seg); loadmap = kzalloc(struct_size(loadmap, segs, nloads), GFP_KERNEL);
loadmap = kzalloc(size, GFP_KERNEL);
if (!loadmap) if (!loadmap)
return -ENOMEM; return -ENOMEM;