| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Mon, 8 Aug 2016 22:05:52 +0200
From: "Luis R. Rodriguez" <mcgrof@...nel.org>
To: Cristina Moraru <cristina.moraru09@...il.com>,
Josh Triplett <josh@...htriplett.org>,
"vegard.nossum@...il.com" <vegard.nossum@...il.com>,
Valentin Rothberg <valentinrothberg@...il.com>,
Paul Bolle <pebolle@...cali.nl>,
Dmitry Torokhov <dmitry.torokhov@...il.com>,
Stephen Boyd <sboyd@...eaurora.org>
Cc: linux-kernel@...r.kernel.org, mcgrof@...nel.org, teg@...m.no,
kay@...y.org, rusty@...tcorp.com.au, akpm@...ux-foundation.org,
backports@...r.kernel.org, gregkh@...uxfoundation.org,
mmarek@...e.com, mchehab@....samsung.com,
rafael.j.wysocki@...el.com
Subject: Re: [RFC PATCH 3/3] Add dynamic pegging of Kconfig symbol
On Sun, Jul 31, 2016 at 05:33:52PM +0200, Cristina Moraru wrote:
> Update modpost to add dynamic pegging of CONFIG_* symbol
> from file ./scripts/mod/Module.ksymb into kconfig_symbol
> attribute of struct module. This information will be
> further exposed in userspace for extracting build options
> for the required modules.
>
> Note: this patch is part of a proof of concept and does
> not represent the final version.
>
> This patch is part of a research project within
> Google Summer of Code of porting 'make localmodconfig'
> for backported drivers.
>
> Signed-off-by: Cristina Moraru <cristina.moraru09@...il.com>
> ---
> scripts/mod/modpost.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++
> scripts/mod/modpost.h | 1 +
> 2 files changed, 48 insertions(+)
>
> diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
> index 48958d3..d80c062 100644
> --- a/scripts/mod/modpost.c
> +++ b/scripts/mod/modpost.c
> @@ -42,6 +42,8 @@ static int sec_mismatch_fatal = 0;
> /* ignore missing files */
> static int ignore_missing_files;
>
> +#define MOD_KSYMB_FILENAME "scripts/mod/Module.ksymb"
> +
> enum export {
> export_plain, export_unused, export_gpl,
> export_unused_gpl, export_gpl_future, export_unknown
> @@ -2245,6 +2247,50 @@ static void add_srcversion(struct buffer *b, struct module *mod)
> }
> }
>
> +static void get_kconfig_symbol(struct module *mod) {
> +
> + unsigned long size, pos = 0;
> + void *file = grab_file(MOD_KSYMB_FILENAME, &size);
> + char *line, *short_name;
> +
> + if (!file)
> + return;
> +
> + short_name = strrchr(mod->name, '/');
> + short_name++;
> +
> + while ((line = get_next_line(&pos, file, size))) {
> + char *modname, *kconfig_symbol, *p;
> +
> + modname = line;
> + if (!(p = strchr(line, ' ')))
> + goto fail;
> + *p++ = '\0';
> + if (!strcmp(short_name, modname)) {
You had mentioned in the last patch that mod->name seemed to
get the respective name used in the struct driver, however
I am not seeing that. At least modpost seems to do this:
MODLISTCMD := find $(MODVERDIR) -name '*.mod' | xargs -r grep -h '\.ko$$' | sort -u
The extra $ is needed since this is part of for the makefile, to run this yourself
after a build do:
find ./ -name '*.mod' | xargs -r grep -h '\.ko$' | sort -u
This is the first step. It hunts for all modules.
Second step is:
cmd_modpost = $(MODLISTCMD) | sed 's/\.ko$$/.o/' | $(modpost) $(MODPOST_OPT) -s -T -
The sed there just swaps the .ko for .o and then it runs modpost, taking the filenames
from stdin. We help modpost further to highlight that the module list is in stdin by
it using "-T -", this calls read_symbols_from_files("-"). From this it iterates over
each module list and for each it calls read_symbols(). The name is set via
mod = new_module();
This just strips the .o but the same object build name is used. Perhaps the issue
is more of where the userspace tool you are using is getting the driver name instead?
If that's the issue the tool I think provides still the file path and as such the
object name, so that could be used instead ?
> + kconfig_symbol = p;
> + if ((p = strchr(kconfig_symbol, ' ')))
> + *p = '\0';
> + strcpy(mod->kconfig_symbol, kconfig_symbol);
> + break;
> + }
> + }
> + release_file(file, size);
> + return;
> +fail:
> + release_file(file, size);
> + fatal("parse error in Module.ksymb file\n");
> +}
> +
> +static void add_kconfig_symbol(struct buffer *b, struct module *mod)
> +{
> + get_kconfig_symbol(mod);
> + if (mod->kconfig_symbol[0]) {
> + buf_printf(b, "\n");
> + buf_printf(b, "MODULE_INFO(kconfig_symbol, \"%s\");\n",
> + mod->kconfig_symbol);
> + }
> +}
> +
> static void write_if_changed(struct buffer *b, const char *fname)
> {
> char *tmp;
> @@ -2478,6 +2524,7 @@ int main(int argc, char **argv)
> add_depends(&buf, mod, modules);
> add_moddevtable(&buf, mod);
> add_srcversion(&buf, mod);
> + add_kconfig_symbol(&buf, mod);
>
> sprintf(fname, "%s.mod.c", mod->name);
> write_if_changed(&buf, fname);
> diff --git a/scripts/mod/modpost.h b/scripts/mod/modpost.h
> index 6a5e151..1ba48b1 100644
> --- a/scripts/mod/modpost.h
> +++ b/scripts/mod/modpost.h
> @@ -119,6 +119,7 @@ struct module {
> int has_cleanup;
> struct buffer dev_table_buf;
> char srcversion[25];
> + char kconfig_symbol[50];
Other than that please check for the longest symbol name here, is 50 enough?
Can we add a build warning / compile issue if this is longer than 50 on modpost?
That would in turn avoid possible bugs, and we'd be setting a limit. But really
is 50 the limit we want ?
Luis
Powered by blists - more mailing lists