linux-kernel - Re: [PATCH] gendwarfksyms: make -T symtypes output be in name order

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

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <CABCJKucSF7O8m6-QM4-J7-qTNTvFFax3=_v_kFy_3qRZZ6ym_Q@mail.gmail.com>
Date: Mon, 23 Jun 2025 08:22:50 -0700
From: Sami Tolvanen <samitolvanen@...gle.com>
To: Giuliano Procida <gprocida@...gle.com>
Cc: Masahiro Yamada <masahiroy@...nel.org>, Greg Kroah-Hartman <gregkh@...uxfoundation.org>, 
	linux-kbuild@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] gendwarfksyms: make -T symtypes output be in name order

Hi Giuliano,

On Mon, Jun 23, 2025 at 2:26 AM Giuliano Procida <gprocida@...gle.com> wrote:
>
> When writing symtypes information, we iterate through the entire hash
> table containing type expansions. The key order varies unpredictably
> as new entries are added, making it harder to compare symtypes between
> builds.
>
> Resolve this by sorting the type expansions by name before output.
>
> Signed-off-by: Giuliano Procida <gprocida@...gle.com>
> ---
>  scripts/gendwarfksyms/types.c | 29 ++++++++++++++++++++++++++---
>  1 file changed, 26 insertions(+), 3 deletions(-)
>
> diff --git a/scripts/gendwarfksyms/types.c b/scripts/gendwarfksyms/types.c
> index 7bd459ea6c59..51c1471e8684 100644
> --- a/scripts/gendwarfksyms/types.c
> +++ b/scripts/gendwarfksyms/types.c
> @@ -6,6 +6,8 @@
>  #define _GNU_SOURCE
>  #include <inttypes.h>
>  #include <stdio.h>
> +#include <stdlib.h>
> +#include <string.h>
>  #include <zlib.h>
>
>  #include "gendwarfksyms.h"
> @@ -179,20 +181,41 @@ static int type_map_get(const char *name, struct type_expansion **res)
>         return -1;
>  }
>
> +static int cmp_expansion_name(const void *p1, const void *p2)
> +{
> +       struct type_expansion *const *e1 = p1;
> +       struct type_expansion *const *e2 = p2;
> +
> +       return strcmp((*e1)->name, (*e2)->name);
> +}
> +
>  static void type_map_write(FILE *file)
>  {
>         struct type_expansion *e;
>         struct hlist_node *tmp;
> +       struct type_expansion **es;
> +       size_t count = 0;
> +       size_t i = 0;
>
>         if (!file)
>                 return;
>
> -       hash_for_each_safe(type_map, e, tmp, hash) {
> -               checkp(fputs(e->name, file));
> +       hash_for_each_safe(type_map, e, tmp, hash)
> +               ++count;
> +       es = xmalloc(count * sizeof(struct type_expansion *));
> +       hash_for_each_safe(type_map, e, tmp, hash)
> +               es[i++] = e;
> +
> +       qsort(es, count, sizeof(struct type_expansion *), cmp_expansion_name);
> +
> +       for (i = 0; i < count; ++i) {
> +               checkp(fputs(es[i]->name, file));
>                 checkp(fputs(" ", file));
> -               type_list_write(&e->expanded, file);
> +               type_list_write(&es[i]->expanded, file);
>                 checkp(fputs("\n", file));
>         }
> +
> +       free(es);

Looks like a nice improvement. Thanks for the patch!

Reviewed-by: Sami Tolvanen <samitolvanen@...gle.com>

Sami