Commit e0349c46 authored by Antonio Quartulli's avatar Antonio Quartulli Committed by Andrew Morton
Browse files

scripts/gdb/linux/symbols.py: address changes to module_sect_attrs

When loading symbols from kernel modules we used to iterate
from 0 to module_sect_attrs::nsections, in order to
retrieve their name and address.

However module_sect_attrs::nsections has been removed from
the struct by a previous commit.

Re-arrange the iteration by accessing all items in
module_sect_attrs::grp::bin_attrs[] until NULL is found
(it's a NULL terminated array).

At the same time the symbol address cannot be extracted
from module_sect_attrs::attrs[]::address anymore because
it has also been deleted. Fetch it from
module_sect_attrs::grp::bin_attrs[]::private as described
in 4b2c11e4.

Link: https://lkml.kernel.org/r/20250221204034.4430-1-antonio@mandelbit.com


Fixes: d8959b94 ("module: sysfs: Drop member 'module_sect_attrs::nsections'")
Fixes: 4b2c11e4 ("module: sysfs: Drop member 'module_sect_attr::address'")
Signed-off-by: default avatarAntonio Quartulli <antonio@mandelbit.com>
Reviewed-by: default avatarJan Kiszka <jan.kiszka@siemens.com>
Cc: Thomas Weißschuh <linux@weissschuh.net>
Cc: Kieran Bingham <kbingham@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent f8731364
Loading
Loading
Loading
Loading
+9 −4
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ import gdb
import os
import re

from itertools import count
from linux import modules, utils, constants


@@ -95,10 +96,14 @@ lx-symbols command."""
        except gdb.error:
            return str(module_addr)

        attrs = sect_attrs['attrs']
        section_name_to_address = {
            attrs[n]['battr']['attr']['name'].string(): attrs[n]['address']
            for n in range(int(sect_attrs['nsections']))}
        section_name_to_address = {}
        for i in count():
            # this is a NULL terminated array
            if sect_attrs['grp']['bin_attrs'][i] == 0x0:
                break

            attr = sect_attrs['grp']['bin_attrs'][i].dereference()
            section_name_to_address[attr['attr']['name'].string()] = attr['private']

        textaddr = section_name_to_address.get(".text", module_addr)
        args = []