From: Dave.Martin@arm.com (Dave Martin)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 1/2] module: Overwrite st_size instead of st_info
Date: Fri, 23 Nov 2018 17:59:45 +0000 [thread overview]
Message-ID: <20181123175945.GL3505@e103592.cambridge.arm.com> (raw)
In-Reply-To: <20181119162513.16562-1-vincent.whitchurch@axis.com>
On Mon, Nov 19, 2018 at 05:25:12PM +0100, Vincent Whitchurch wrote:
> st_info is currently overwritten after relocation and used to store the
> elf_type(). However, we're going to need it fix kallsyms on ARM's
> Thumb-2 kernels, so preserve st_info and overwrite the st_size field
> instead. st_size is neither used by the module core nor by any
> architecture.
>
> Signed-off-by: Vincent Whitchurch <vincent.whitchurch@axis.com>
> ---
> v4: Split out to separate patch. Use st_size instead of st_other.
> v1-v3: See PATCH 2/2
>
> kernel/module.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/kernel/module.c b/kernel/module.c
> index 49a405891587..3d86a38b580c 100644
> --- a/kernel/module.c
> +++ b/kernel/module.c
> @@ -2682,7 +2682,7 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
>
> /* Set types up while we still have access to sections. */
> for (i = 0; i < mod->kallsyms->num_symtab; i++)
> - mod->kallsyms->symtab[i].st_info
> + mod->kallsyms->symtab[i].st_size
> = elf_type(&mod->kallsyms->symtab[i], info);
>
> /* Now populate the cut down core kallsyms for after init. */
> @@ -4061,7 +4061,7 @@ int module_get_kallsym(unsigned int symnum, unsigned long *value, char *type,
> kallsyms = rcu_dereference_sched(mod->kallsyms);
> if (symnum < kallsyms->num_symtab) {
> *value = kallsyms->symtab[symnum].st_value;
> - *type = kallsyms->symtab[symnum].st_info;
> + *type = kallsyms->symtab[symnum].st_size;
> strlcpy(name, symname(kallsyms, symnum), KSYM_NAME_LEN);
> strlcpy(module_name, mod->name, MODULE_NAME_LEN);
> *exported = is_exported(name, *value, mod);
Based on the discussion here:
Reviewed-by: Dave Martin <Dave.Martin@arm.com>
(I still think this is a bit gross, but without resorting to overkill
there's not an obvious nicer option. Even before this patch, we were
abusing st_info. Of course, someday somebody may find a use for
st_size and then we'd need to revisit this code...)
Cheers
---Dave
prev parent reply other threads:[~2018-11-23 17:59 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-19 16:25 [PATCH 1/2] module: Overwrite st_size instead of st_info Vincent Whitchurch
2018-11-19 16:25 ` [PATCH 2/2] ARM: module: Fix function kallsyms on Thumb-2 Vincent Whitchurch
2018-11-23 18:34 ` Dave Martin
2018-11-22 12:01 ` [PATCH 1/2] module: Overwrite st_size instead of st_info Dave Martin
2018-11-22 12:24 ` Vincent Whitchurch
2018-11-22 16:28 ` Jessica Yu
2018-11-22 17:40 ` Ard Biesheuvel
2018-11-22 17:49 ` Russell King - ARM Linux
2018-11-23 17:21 ` Dave Martin
2018-11-23 12:57 ` Miroslav Benes
2018-11-23 17:59 ` Dave Martin [this message]
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=20181123175945.GL3505@e103592.cambridge.arm.com \
--to=dave.martin@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox