projects/linux·commit ff7e0055

module: Clean up ro/nx after early module load failures

ff7e0055 · Andy Lutomirski <[email protected]> · 2014-08-16 04:13:37 +09:30

The commit

    4982223e51e8 module: set nx before marking module MODULE_STATE_COMING.

introduced a regression: if a module fails to parse its arguments or
if mod_sysfs_setup fails, then the module's memory will be freed
while still read-only.  Anything that reuses that memory will crash
as soon as it tries to write to it.

Cc: [email protected] # v3.16
Cc: Rusty Russell <[email protected]>
Signed-off-by: Andy Lutomirski <[email protected]>
Signed-off-by: Rusty Russell <[email protected]>
Commit
ff7e0055bb5ddbbb320cdd8dfd3e18672bddd2ad
Parents
c9d26423

Changes

1 files changed · +5 −0

FileStatusAddDelContent
kernel/module.cmodified+5−0View file

kernel/module.c

View file
diff --git a/kernel/module.c b/kernel/module.c
index 6f69463..03214bd 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -3304,6 +3304,11 @@ static int load_module(struct load_info *info, const char __user *uargs,
mutex_lock(&module_mutex);
module_bug_cleanup(mod);
mutex_unlock(&module_mutex);
+
+ /* we can't deallocate the module until we clear memory protection */
+ unset_module_init_ro_nx(mod);
+ unset_module_core_ro_nx(mod);
+
ddebug_cleanup:
dynamic_debug_remove(info->debug);
synchronize_sched();