module: Rename debug_align() as strict_align()

debug_align() was added by commit 84e1c6bb38eb ("x86: Add RO/NX
protection for loadable kernel modules")

At that time the config item was CONFIG_DEBUG_SET_MODULE_RONX.

But nowadays it has changed to CONFIG_STRICT_MODULE_RWX and
debug_align() is confusing because it has nothing to do with
DEBUG.

Rename it strict_align()

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>

diff --git a/kernel/module/internal.h b/kernel/module/internal.h
index e94defbeda005e9a755bf1465dc31baa08f91d25..cbc268af23ae78423165b707d9a66fb49fb805c6 100644 (file)
--- a/kernel/module/internal.h
+++ b/kernel/module/internal.h
@@ -26,9 +26,9 @@
  * only when CONFIG_STRICT_MODULE_RWX=y
  */
 #ifdef CONFIG_STRICT_MODULE_RWX
-# define debug_align(X) PAGE_ALIGN(X)
+# define strict_align(X) PAGE_ALIGN(X)
 #else
-# define debug_align(X) (X)
+# define strict_align(X) (X)
 #endif
 
 extern struct mutex module_mutex;

diff --git a/kernel/module/kallsyms.c b/kernel/module/kallsyms.c
index a3da0686a2a6bad2c9d13ca350a1d5c4b74e7d48..438492e103c8f18a6e2255ebe96710fae3d289cd 100644 (file)
--- a/kernel/module/kallsyms.c
+++ b/kernel/module/kallsyms.c
@@ -139,7 +139,7 @@ void layout_symtab(struct module *mod, struct load_info *info)
        mod->core_layout.size += strtab_size;
        info->core_typeoffs = mod->core_layout.size;
        mod->core_layout.size += ndst * sizeof(char);
-       mod->core_layout.size = debug_align(mod->core_layout.size);
+       mod->core_layout.size = strict_align(mod->core_layout.size);
 
        /* Put string table section at end of init part of module. */
        strsect->sh_flags |= SHF_ALLOC;
@@ -154,7 +154,7 @@ void layout_symtab(struct module *mod, struct load_info *info)
        mod->init_layout.size += sizeof(struct mod_kallsyms);
        info->init_typeoffs = mod->init_layout.size;
        mod->init_layout.size += nsrc * sizeof(char);
-       mod->init_layout.size = debug_align(mod->init_layout.size);
+       mod->init_layout.size = strict_align(mod->init_layout.size);
 }
 
 /*

diff --git a/kernel/module/main.c b/kernel/module/main.c
index 55e710bc7f467e5ca7122d62b1997d4cc0f80a91..e6a72c3651f6658cd04ca58db857e3d936a33dd6 100644 (file)
--- a/kernel/module/main.c
+++ b/kernel/module/main.c
@@ -1447,19 +1447,19 @@ static void layout_sections(struct module *mod, struct load_info *info)
                }
                switch (m) {
                case 0: /* executable */
-                       mod->core_layout.size = debug_align(mod->core_layout.size);
+                       mod->core_layout.size = strict_align(mod->core_layout.size);
                        mod->core_layout.text_size = mod->core_layout.size;
                        break;
                case 1: /* RO: text and ro-data */
-                       mod->core_layout.size = debug_align(mod->core_layout.size);
+                       mod->core_layout.size = strict_align(mod->core_layout.size);
                        mod->core_layout.ro_size = mod->core_layout.size;
                        break;
                case 2: /* RO after init */
-                       mod->core_layout.size = debug_align(mod->core_layout.size);
+                       mod->core_layout.size = strict_align(mod->core_layout.size);
                        mod->core_layout.ro_after_init_size = mod->core_layout.size;
                        break;
                case 4: /* whole core */
-                       mod->core_layout.size = debug_align(mod->core_layout.size);
+                       mod->core_layout.size = strict_align(mod->core_layout.size);
                        break;
                }
        }
@@ -1481,11 +1481,11 @@ static void layout_sections(struct module *mod, struct load_info *info)
                }
                switch (m) {
                case 0: /* executable */
-                       mod->init_layout.size = debug_align(mod->init_layout.size);
+                       mod->init_layout.size = strict_align(mod->init_layout.size);
                        mod->init_layout.text_size = mod->init_layout.size;
                        break;
                case 1: /* RO: text and ro-data */
-                       mod->init_layout.size = debug_align(mod->init_layout.size);
+                       mod->init_layout.size = strict_align(mod->init_layout.size);
                        mod->init_layout.ro_size = mod->init_layout.size;
                        break;
                case 2:
@@ -1496,7 +1496,7 @@ static void layout_sections(struct module *mod, struct load_info *info)
                        mod->init_layout.ro_after_init_size = mod->init_layout.ro_size;
                        break;
                case 4: /* whole init */
-                       mod->init_layout.size = debug_align(mod->init_layout.size);
+                       mod->init_layout.size = strict_align(mod->init_layout.size);
                        break;
                }
        }