Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de7f01c2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'modules-for-v4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux 

Pull module updates from Jessica Yu:
 "Minor code cleanup and also allow sig_enforce param to be shown in
  sysfs with CONFIG_MODULE_SIG_FORCE"

* tag 'modules-for-v4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux:
  module: Allow to always show the status of modsign
  module: Do not access sig_enforce directly
parents 8d1e5133 c554b898

kernel/module.c

+1 −3
Original line number Diff line number Diff line
@@ -274,9 +274,7 @@ static void module_assert_mutex_or_preempt(void) 
}



static bool sig_enforce = IS_ENABLED(CONFIG_MODULE_SIG_FORCE);

#ifndef CONFIG_MODULE_SIG_FORCE

module_param(sig_enforce, bool_enable_only, 0644);

#endif /* !CONFIG_MODULE_SIG_FORCE */



/*

 * Export sig_enforce kernel cmdline parameter to allow other subsystems rely
@@ -2785,7 +2783,7 @@ static int module_sig_check(struct load_info *info, int flags) 
	}



	/* Not having a signature is only an error if we're strict. */

	if (err == -ENOKEY && !sig_enforce)

	if (err == -ENOKEY && !is_module_sig_enforced())

		err = 0;



	return err;