projects/linux·commit 168e47f2

kernel/module.c: Update debug alignment after symtable generation

168e47f2 · Laura Abbott <[email protected]> · 2015-02-25 14:14:57 -08:00

When CONFIG_DEBUG_SET_MODULE_RONX is enabled, the sizes of
module sections are aligned up so appropriate permissions can
be applied. Adjusting for the symbol table may cause them to
become unaligned. Make sure to re-align the sizes afterward.

Signed-off-by: Laura Abbott <[email protected]>
Acked-by: Rusty Russell <[email protected]>
Signed-off-by: Catalin Marinas <[email protected]>
Commit
168e47f2a6581fdbc5bb1845aeca1e50e2bc5c4b
Parents
8b5f5a07

Changes

1 files changed · +2 −0

FileStatusAddDelContent
kernel/module.cmodified+2−0View file

kernel/module.c

View file
diff --git a/kernel/module.c b/kernel/module.c
index b34813f..cc93cf6 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -2313,11 +2313,13 @@ static void layout_symtab(struct module *mod, struct load_info *info)
info->symoffs = ALIGN(mod->core_size, symsect->sh_addralign ?: 1);
info->stroffs = mod->core_size = info->symoffs + ndst * sizeof(Elf_Sym);
mod->core_size += strtab_size;
+ mod->core_size = debug_align(mod->core_size);
/* Put string table section at end of init part of module. */
strsect->sh_flags |= SHF_ALLOC;
strsect->sh_entsize = get_offset(mod, &mod->init_size, strsect,
info->index.str) | INIT_OFFSET_MASK;
+ mod->init_size = debug_align(mod->init_size);
pr_debug("\t%s\n", info->secstrings + strsect->sh_name);
}