In case the elf's header e_shstrndx contains SHN_XINDEX,
we need to call elf_getshdrstrndx to get the proper
string table index.

Signed-off-by: Jiri Olsa <jo...@kernel.org>
---
 dutil.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/dutil.c b/dutil.c
index 7b667647420f..321f4be6669e 100644
--- a/dutil.c
+++ b/dutil.c
@@ -179,13 +179,17 @@ Elf_Scn *elf_section_by_name(Elf *elf, GElf_Ehdr *ep,
 {
        Elf_Scn *sec = NULL;
        size_t cnt = 1;
+       size_t shstrndx = ep->e_shstrndx;
+
+       if (shstrndx == SHN_XINDEX && elf_getshdrstrndx(elf, &shstrndx))
+               return NULL;
 
        while ((sec = elf_nextscn(elf, sec)) != NULL) {
                char *str;
 
                gelf_getshdr(sec, shp);
-               str = elf_strptr(elf, ep->e_shstrndx, shp->sh_name);
-               if (!strcmp(name, str)) {
+               str = elf_strptr(elf, shstrndx, shp->sh_name);
+               if (str && !strcmp(name, str)) {
                        if (index)
                                *index = cnt;
                        break;
-- 
2.27.0

Reply via email to