aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.18/099-module_arch_freeing_init-new-hook-for-archs-before-m.patch
diff options
context:
space:
mode:
authorZoltan Herpai <wigyori@uid0.hu>2016-10-26 15:33:07 +0200
committerGitHub <noreply@github.com>2016-10-26 15:33:07 +0200
commit1378f4a4d9908dd48dcf21ee526334d86344ec68 (patch)
tree1da1495f9fc9f046a169fb451ea5e6af13cc6453 /target/linux/generic/patches-3.18/099-module_arch_freeing_init-new-hook-for-archs-before-m.patch
parent2aefb514a4852f4c427b467150bbc7cdfe024528 (diff)
parent2c54d989b46284bc5ee5b43d4ba7c2762c2241ed (diff)
downloadupstream-1378f4a4d9908dd48dcf21ee526334d86344ec68.tar.gz
upstream-1378f4a4d9908dd48dcf21ee526334d86344ec68.tar.bz2
upstream-1378f4a4d9908dd48dcf21ee526334d86344ec68.zip
Merge pull request #151 from wigyori/cc-dirtycow
CC: generic: bump kernel to 3.18.44
Diffstat (limited to 'target/linux/generic/patches-3.18/099-module_arch_freeing_init-new-hook-for-archs-before-m.patch')
-rw-r--r--target/linux/generic/patches-3.18/099-module_arch_freeing_init-new-hook-for-archs-before-m.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-3.18/099-module_arch_freeing_init-new-hook-for-archs-before-m.patch b/target/linux/generic/patches-3.18/099-module_arch_freeing_init-new-hook-for-archs-before-m.patch
index 2e66de29df..352bf6de15 100644
--- a/target/linux/generic/patches-3.18/099-module_arch_freeing_init-new-hook-for-archs-before-m.patch
+++ b/target/linux/generic/patches-3.18/099-module_arch_freeing_init-new-hook-for-archs-before-m.patch
@@ -164,7 +164,7 @@ Origin: backport, https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.gi
module_free(mod, mod->module_init);
kfree(mod->args);
percpu_modfree(mod);
-@@ -2978,6 +2983,7 @@ static struct module *layout_and_allocat
+@@ -2983,6 +2988,7 @@ static struct module *layout_and_allocat
static void module_deallocate(struct module *mod, struct load_info *info)
{
percpu_modfree(mod);
@@ -172,7 +172,7 @@ Origin: backport, https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.gi
module_free(mod, mod->module_init);
module_free(mod, mod->module_core);
}
-@@ -3100,6 +3106,7 @@ static int do_init_module(struct module
+@@ -3105,6 +3111,7 @@ static int do_init_module(struct module
rcu_assign_pointer(mod->kallsyms, &mod->core_kallsyms);
#endif
unset_module_init_ro_nx(mod);