* PR29566, objdump -p considers an empty .gnu.version_r invalid
@ 2022-09-21 12:39 Alan Modra
0 siblings, 0 replies; only message in thread
From: Alan Modra @ 2022-09-21 12:39 UTC (permalink / raw)
To: binutils
Allow and ignore an empty section.
PR 29566
* elf.c (bfd_section_from_shdr): Don't set elf_dynverdef or
elf_dynverref for empty sections.
(_bfd_elf_slurp_version_tables): Remove now redundant tests.
diff --git a/bfd/elf.c b/bfd/elf.c
index 2eb2a97370a..bc433cf516c 100644
--- a/bfd/elf.c
+++ b/bfd/elf.c
@@ -2479,7 +2479,8 @@ bfd_section_from_shdr (bfd *abfd, unsigned int shindex)
}
case SHT_GNU_verdef:
- elf_dynverdef (abfd) = shindex;
+ if (hdr->sh_info != 0)
+ elf_dynverdef (abfd) = shindex;
elf_tdata (abfd)->dynverdef_hdr = *hdr;
ret = _bfd_elf_make_section_from_shdr (abfd, hdr, name, shindex);
goto success;
@@ -2494,7 +2495,8 @@ bfd_section_from_shdr (bfd *abfd, unsigned int shindex)
goto success;
case SHT_GNU_verneed:
- elf_dynverref (abfd) = shindex;
+ if (hdr->sh_info != 0)
+ elf_dynverref (abfd) = shindex;
elf_tdata (abfd)->dynverref_hdr = *hdr;
ret = _bfd_elf_make_section_from_shdr (abfd, hdr, name, shindex);
goto success;
@@ -8877,8 +8879,7 @@ _bfd_elf_slurp_version_tables (bfd *abfd, bool default_imported_symver)
hdr = &elf_tdata (abfd)->dynverref_hdr;
- if (hdr->sh_info == 0
- || hdr->sh_info > hdr->sh_size / sizeof (Elf_External_Verneed))
+ if (hdr->sh_info > hdr->sh_size / sizeof (Elf_External_Verneed))
{
error_return_bad_verref:
_bfd_error_handler
@@ -9011,7 +9012,7 @@ _bfd_elf_slurp_version_tables (bfd *abfd, bool default_imported_symver)
hdr = &elf_tdata (abfd)->dynverdef_hdr;
- if (hdr->sh_info == 0 || hdr->sh_size < sizeof (Elf_External_Verdef))
+ if (hdr->sh_size < sizeof (Elf_External_Verdef))
{
error_return_bad_verdef:
_bfd_error_handler
--
Alan Modra
Australia Development Lab, IBM
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-09-21 12:39 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-21 12:39 PR29566, objdump -p considers an empty .gnu.version_r invalid Alan Modra
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 read-only IMAP folder(s) and NNTP newsgroup(s).