LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Laura Abbott <lauraa@codeaurora.org>
To: Rusty Russell <rusty@rustcorp.com.au>
Cc: Laura Abbott <lauraa@codeaurora.org>,
	Will Deacon <will.deacon@arm.com>,
	Catalin Marinas <catalin.marinas@arm.com>,
	Kees Cook <keescook@chromium.org>,
	Russell King <linux@arm.linux.org.uk>,
	linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org
Subject: [PATCH 3/3] kernel/module.c: Update debug alignment after symtable generation
Date: Wed, 25 Feb 2015 14:14:57 -0800	[thread overview]
Message-ID: <1424902497-32141-4-git-send-email-lauraa@codeaurora.org> (raw)
In-Reply-To: <1424902497-32141-1-git-send-email-lauraa@codeaurora.org>


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 <lauraa@codeaurora.org>
---
 kernel/module.c | 2 ++
 1 file changed, 2 insertions(+)

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);
 }
 
-- 
Qualcomm Innovation Center, Inc.
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project


  parent reply	other threads:[~2015-02-25 22:16 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-02-25 22:14 [PATCH 0/3] CONFIG_DEBUG_SET_MODULE_RONX fixups Laura Abbott
2015-02-25 22:14 ` [PATCH 1/3] arm64: Don't use is_module_addr in setting page attributes Laura Abbott
2015-03-04 16:47   ` Catalin Marinas
2015-02-25 22:14 ` [PATCH 2/3] arm: " Laura Abbott
2015-02-25 22:14 ` Laura Abbott [this message]
2015-02-26  1:33   ` [PATCH 3/3] kernel/module.c: Update debug alignment after symtable generation Rusty Russell
2015-02-25 22:17 ` [PATCH 0/3] CONFIG_DEBUG_SET_MODULE_RONX fixups Kees Cook
2015-03-24 12:04   ` Paolo Pisati

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1424902497-32141-4-git-send-email-lauraa@codeaurora.org \
    --to=lauraa@codeaurora.org \
    --cc=catalin.marinas@arm.com \
    --cc=keescook@chromium.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@arm.linux.org.uk \
    --cc=rusty@rustcorp.com.au \
    --cc=will.deacon@arm.com \
    --subject='Re: [PATCH 3/3] kernel/module.c: Update debug alignment after symtable generation' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).