Commit 7337f929 authored by Christophe Leroy's avatar Christophe Leroy Committed by Luis Chamberlain
Browse files

module: Rename debug_align() as strict_align() 



debug_align() was added by commit 84e1c6bb ("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: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarLuis Chamberlain <mcgrof@kernel.org>
parent ef505058

kernel/module/internal.h

+2 −2
Original line number Diff line number Diff line
@@ -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;

kernel/module/kallsyms.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

}



/*

kernel/module/main.c

+7 −7
Original line number Diff line number Diff line
@@ -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;

		}

	}