From: Peter Zijlstra <peterz@infradead.org>
To: Masahiro Yamada <masahiroy@kernel.org>
Cc: mcgrof@kernel.org, x86@kernel.org, hpa@zytor.com,
petr.pavlu@suse.com, samitolvanen@google.com,
da.gomez@samsung.com, nathan@kernel.org, nicolas@fjasle.eu,
linux-kernel@vger.kernel.org, linux-modules@vger.kernel.org,
linux-kbuild@vger.kernel.org, hch@infradead.org,
gregkh@linuxfoundation.org
Subject: Re: [RFC] module: Strict per-modname namespaces
Date: Thu, 7 Nov 2024 12:58:19 +0100 [thread overview]
Message-ID: <20241107115819.GA38786@noisy.programming.kicks-ass.net> (raw)
In-Reply-To: <CAK7LNAQ-wMTOaCuBab-JOfz4ggefNiEBmiKCUpuFncTqS0P3xQ@mail.gmail.com>
On Thu, Nov 07, 2024 at 04:55:46PM +0900, Masahiro Yamada wrote:
> > diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
> > index 107393a8c48a..d1de3044ee03 100644
> > --- a/scripts/mod/modpost.c
> > +++ b/scripts/mod/modpost.c
> > @@ -1553,8 +1553,19 @@ static void mod_set_crcs(struct module *mod)
> > free(buf);
> > }
> >
> > +static const char *mod_basename(const char *modname)
> > +{
> > + const char *basename = strrchr(modname, '/');
> > + if (basename)
> > + basename++;
> > + else
> > + basename = modname;
> > + return basename;
> > +}
> > +
> > static void read_symbols(const char *modname)
> > {
> > + char module_namespace[MODULE_NAME_LEN + 8];
> > const char *symname;
> > char *version;
> > char *license;
> > @@ -1586,12 +1597,16 @@ static void read_symbols(const char *modname)
> > license = get_next_modinfo(&info, "license", license);
> > }
> >
> > - namespace = get_modinfo(&info, "import_ns");
> > - while (namespace) {
> > + for (namespace = get_modinfo(&info, "import_ns"); namespace;
> > + namespace = get_next_modinfo(&info, "import_ns", namespace)) {
>
> The conversion from while() to for() is an unrelated change.
> Split it to a separate patch if you want to change it.
Yeah, at some point I had a break or continue in there I think, it
didn't live. If you like I can keep it a split it out.
> > + if (strstarts(namespace, "MODULE_"))
> > + error("importing implicit module namespace: %s\n", namespace);
> > +
> > add_namespace(&mod->imported_namespaces, namespace);
> > - namespace = get_next_modinfo(&info, "import_ns",
> > - namespace);
> > }
> > + snprintf(module_namespace, sizeof(module_namespace), "MODULE_%s",
> > + mod_basename(mod->name));
.. here ..
> > + add_namespace(&mod->imported_namespaces, module_namespace);
> >
> > if (extra_warn && !get_modinfo(&info, "description"))
> > warn("missing MODULE_DESCRIPTION() in %s\n", modname);
> > @@ -1700,11 +1715,7 @@ static void check_exports(struct module *mod)
> > s->crc_valid = exp->crc_valid;
> > s->crc = exp->crc;
> >
> > - basename = strrchr(mod->name, '/');
> > - if (basename)
> > - basename++;
> > - else
> > - basename = mod->name;
> > + basename = mod_basename(mod->name);
>
> This is an unrelated change.
Hardly unrelated, I added a second usage above. So you're saying I
should've just copy pasted the whole thing and then it would've been
fine?
> So, it should be split into a separate prerequisite patch,
> something like, "modpost: introduce mod_basename() helper"
Well, I can...
Anyway, let me see about doing that whole ',' parsing thing people seem
to want.
next prev parent reply other threads:[~2024-11-07 11:58 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-06 19:02 [RFC] module: Strict per-modname namespaces Peter Zijlstra
2024-11-06 23:42 ` Luis Chamberlain
2024-11-07 5:46 ` Christoph Hellwig
2024-11-07 8:12 ` Masahiro Yamada
2024-11-07 12:50 ` Peter Zijlstra
2024-11-07 5:39 ` Christoph Hellwig
2024-11-08 8:08 ` Geert Uytterhoeven
2024-11-07 6:12 ` Greg KH
2024-11-07 7:55 ` Masahiro Yamada
2024-11-07 11:58 ` Peter Zijlstra [this message]
2024-11-07 15:27 ` Peter Zijlstra
2024-11-08 15:28 ` H. Peter Anvin
2024-11-08 15:35 ` Peter Zijlstra
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=20241107115819.GA38786@noisy.programming.kicks-ass.net \
--to=peterz@infradead.org \
--cc=da.gomez@samsung.com \
--cc=gregkh@linuxfoundation.org \
--cc=hch@infradead.org \
--cc=hpa@zytor.com \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-modules@vger.kernel.org \
--cc=masahiroy@kernel.org \
--cc=mcgrof@kernel.org \
--cc=nathan@kernel.org \
--cc=nicolas@fjasle.eu \
--cc=petr.pavlu@suse.com \
--cc=samitolvanen@google.com \
--cc=x86@kernel.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;
as well as URLs for NNTP newsgroup(s).