Rename check_modinfo() to check_modinfo_vermagic() to clarify it only checks vermagic compatibility.
Move livepatch check to happen after vermagic check in early_mod_check(), creating proper separation of concerns. This makes the module loading sequence more logical: - First verify module vermagic - Then check livepatch-specific requirements No functional changes, just clearer code organization. Signed-off-by: Jinchao Wang <wangjinchao...@gmail.com> --- kernel/module/main.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/kernel/module/main.c b/kernel/module/main.c index a426bd8a18b5..d30bffeef63e 100644 --- a/kernel/module/main.c +++ b/kernel/module/main.c @@ -2571,7 +2571,7 @@ static void module_augment_kernel_taints(struct module *mod, struct load_info *i } -static int check_modinfo(struct module *mod, struct load_info *info, int flags) +static int check_modinfo_vermagic(struct module *mod, struct load_info *info, int flags) { const char *modmagic = get_modinfo(info, "vermagic"); int err; @@ -2590,10 +2590,6 @@ static int check_modinfo(struct module *mod, struct load_info *info, int flags) return -ENOEXEC; } - err = check_modinfo_livepatch(mod, info); - if (err) - return err; - return 0; } @@ -3334,7 +3330,11 @@ static int early_mod_check(struct load_info *info, int flags) if (!check_modstruct_version(info, info->mod)) return -ENOEXEC; - err = check_modinfo(info->mod, info, flags); + err = check_modinfo_vermagic(info->mod, info, flags); + if (err) + return err; + + err = check_modinfo_livepatch(info->mod, info); if (err) return err; -- 2.43.0