archive/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2025-08-16 22:51:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

module: move check_modinfo() early to early_mod_check()

Browse source 
This moves check_modinfo() to early_mod_check(). This
doesn't make any functional changes either, as check_modinfo()
was the first call on layout_and_allocate(), so we're just
moving it back one routine and at the end.

This let's us keep separate the checkers from the allocator.

Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
This commit is contained in:
Luis Chamberlain 2023-03-19 14:27:39 -07:00
parent 85e6f61c13
commit 02da2cbab4
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
kernel/module/main.c
View file

@ -2273,10 +2273,6 @@ static struct module *layout_and_allocate(struct load_info *info, int flags)
unsigned int ndx; unsigned int ndx;
int err; int err;
err = check_modinfo(info->mod, info, flags);
if (err)
return ERR_PTR(err);
/* Allow arches to frob section contents and sizes. */ /* Allow arches to frob section contents and sizes. */
err = module_frob_arch_sections(info->hdr, info->sechdrs, err = module_frob_arch_sections(info->hdr, info->sechdrs,
info->secstrings, info->mod); info->secstrings, info->mod);
@ -2690,6 +2686,10 @@ static int early_mod_check(struct load_info *info, int flags)
if (!check_modstruct_version(info, info->mod)) if (!check_modstruct_version(info, info->mod))
return -ENOEXEC; return -ENOEXEC;
err = check_modinfo(info->mod, info, flags);
if (err)
return err;
return 0; return 0;
} }