diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-08-02 13:40:29 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-08-02 14:06:20 -0400 |
| commit | e2f0c255fd7d6abc9fbd72ca97b7fe6fc734e374 (patch) | |
| tree | 26127d6419c7af59cd27c2a52b3564b307b9e303 | |
| parent | e492078acaafc02849b05eb2c4d781cb85c8de7e (diff) | |
| download | longterm-queue-4.18-e2f0c255fd7d6abc9fbd72ca97b7fe6fc734e374.tar.gz | |
module: refresh rodata fix
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/modules-fix-BUG-when-load-module-with-rodata-n.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/queue/modules-fix-BUG-when-load-module-with-rodata-n.patch b/queue/modules-fix-BUG-when-load-module-with-rodata-n.patch index 4d35581..1d81c4f 100644 --- a/queue/modules-fix-BUG-when-load-module-with-rodata-n.patch +++ b/queue/modules-fix-BUG-when-load-module-with-rodata-n.patch @@ -1,4 +1,4 @@ -From 2eef1399a866c57687962e15142b141a4f8e7862 Mon Sep 17 00:00:00 2001 +From 2aa02187dcd386f1fb6d2f71f659ac1d5fb752d9 Mon Sep 17 00:00:00 2001 From: Yang Yingliang <yangyingliang@huawei.com> Date: Thu, 20 Jun 2019 10:18:14 +0800 Subject: [PATCH] modules: fix BUG when load module with rodata=n @@ -52,12 +52,12 @@ Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> Signed-off-by: Jessica Yu <jeyu@kernel.org> diff --git a/kernel/module.c b/kernel/module.c -index c1517053e9d6..41258bab24f1 100644 +index e0419d730034..4f754a06ea95 100644 --- a/kernel/module.c +++ b/kernel/module.c -@@ -1972,13 +1972,9 @@ void module_enable_ro(const struct module *mod, bool after_init) - set_vm_flush_reset_perms(mod->core_layout.base); - set_vm_flush_reset_perms(mod->init_layout.base); +@@ -1951,13 +1951,9 @@ void module_enable_ro(const struct module *mod, bool after_init) + return; + frob_text(&mod->core_layout, set_memory_ro); - frob_text(&mod->core_layout, set_memory_x); @@ -69,8 +69,8 @@ index c1517053e9d6..41258bab24f1 100644 frob_rodata(&mod->init_layout, set_memory_ro); if (after_init) -@@ -2041,6 +2037,12 @@ void set_all_modules_text_ro(void) - static void module_enable_nx(const struct module *mod) { } +@@ -2044,6 +2040,12 @@ static void module_enable_nx(const struct module *mod) { } + static void module_disable_nx(const struct module *mod) { } #endif +static void module_enable_x(const struct module *mod) @@ -82,7 +82,7 @@ index c1517053e9d6..41258bab24f1 100644 #ifdef CONFIG_LIVEPATCH /* * Persist Elf information about a module. Copy the Elf header, -@@ -3637,6 +3639,7 @@ static int complete_formation(struct module *mod, struct load_info *info) +@@ -3613,6 +3615,7 @@ static int complete_formation(struct module *mod, struct load_info *info) module_enable_ro(mod, false); module_enable_nx(mod); |