The following commit has been merged into the core/static_call branch of tip:
Commit-ID: 59cc8e0a906ea23190922e5e0252e5b5a60d70c2 Gitweb: https://git.kernel.org/tip/59cc8e0a906ea23190922e5e0252e5b5a60d70c2 Author: Peter Zijlstra <[email protected]> AuthorDate: Tue, 18 Aug 2020 15:57:38 +02:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Tue, 01 Sep 2020 09:58:04 +02:00 module: Properly propagate MODULE_STATE_COMING failure Now that notifiers got unbroken; use the proper interface to handle notifier errors and propagate them. There were already MODULE_STATE_COMING notifiers that failed; notably: - jump_label_module_notifier() - tracepoint_module_notify() - bpf_event_notify() By propagating this error, we fix those users. Signed-off-by: Peter Zijlstra (Intel) <[email protected]> Signed-off-by: Ingo Molnar <[email protected]> Reviewed-by: Miroslav Benes <[email protected]> Acked-by: Jessica Yu <[email protected]> Acked-by: Josh Poimboeuf <[email protected]> Link: https://lore.kernel.org/r/[email protected] --- kernel/module.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/kernel/module.c b/kernel/module.c index 1c5cff3..3c465cf 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -3792,9 +3792,13 @@ static int prepare_coming_module(struct module *mod) if (err) return err; - blocking_notifier_call_chain(&module_notify_list, - MODULE_STATE_COMING, mod); - return 0; + err = blocking_notifier_call_chain_robust(&module_notify_list, + MODULE_STATE_COMING, MODULE_STATE_GOING, mod); + err = notifier_to_errno(err); + if (err) + klp_module_going(mod); + + return err; } static int unknown_module_param_cb(char *param, char *val, const char *modname,
