[PATCH v4 14/16] modules: Support extended MODVERSIONS info

[Matthew Maurer]

Thanks for the catch. I've sent up v5 to include that fix. I've also
added a changelog and made sure the patches make it to linux-modules@
as Daniel suggested.


On Wed, Sep 25, 2024 at 4:00 PM Sami Tolvanen <samitolvanen at google.com> wrote:
>
> Hi Matt,
>
> On Tue, Sep 24, 2024 at 09:19:56PM +0000, Matthew Maurer wrote:
> > +static void dedotify_ext_version_names(char *str_seq, unsigned long size)
> > +{
> > +     unsigned long out = 0;
> > +     unsigned long in;
> > +     char last = '\0';
> > +
> > +     for (in = 0; in < size; in++) {
> > +             if (last == '\0')
> > +                     /* Skip one leading dot */
> > +                     if (str_seq[in] == '.')
> > +                             in++;
>
> Thanks for addressing Michael's comment, this looks correct to me.
>
> Nit: might be cleaner in a single if statement though:
>
>         /* Skip one leading dot */
>         if (last == '\0' && str_seq[in] == '.')
>                 in++;
>
> > +void modversion_ext_start(const struct load_info *info,
> > +                       struct modversion_info_ext *start)
> > +{
> > +     unsigned int crc_idx = info->index.vers_ext_crc;
> > +     unsigned int name_idx = info->index.vers_ext_name;
> > +     Elf_Shdr *sechdrs = info->sechdrs;
> > +
> > +     /*
> > +      * Both of these fields are needed for this to be useful
> > +      * Any future fields should be initialized to NULL if absent.
> > +      */
> > +     if ((crc_idx == 0) || (name_idx == 0))
> > +             start->remaining = 0;
> > +
> > +     start->crc = (const s32 *)sechdrs[crc_idx].sh_addr;
> > +     start->name = (const char *)sechdrs[name_idx].sh_addr;
> > +     start->remaining = sechdrs[crc_idx].sh_size / sizeof(*start->crc);
> > +}
>
> This looks unchanged from v3, so I think my comment from there
> still applies:
>
> https://lore.kernel.org/lkml/CABCJKufJK0WO92wnW09VTLqZk0ODxhuKQG=HbKE-va0urJU1Vg@mail.gmail.com/
>
> Sami