diff options
| author | Andy Lutomirski <luto@amacapital.net> | 2014-08-16 04:13:37 +0930 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2015-04-09 14:13:45 +0200 |
| commit | 17e7f51dec81495e6571ce8617e3da8ee2e47e78 (patch) | |
| tree | 6025db7be53cc7b9f8f3fcb13a561d97aa080559 /kernel | |
| parent | 9dde9641037a74e968b79685ddaf2ed1311152e8 (diff) | |
| download | lwn-17e7f51dec81495e6571ce8617e3da8ee2e47e78.tar.gz lwn-17e7f51dec81495e6571ce8617e3da8ee2e47e78.zip | |
module: Clean up ro/nx after early module load failures
commit ff7e0055bb5ddbbb320cdd8dfd3e18672bddd2ad upstream.
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: stable@vger.kernel.org # v3.16
Cc: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Andy Lutomirski <luto@amacapital.net>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/module.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/kernel/module.c b/kernel/module.c index 3edb91fabc7a..a97785308f25 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -3332,6 +3332,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(); |