From d03a638a13f1f42348fca535380f0f00381ab3e9 Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Fri, 1 Apr 2022 13:16:46 -0700 Subject: [PATCH] elfcore_grok_freebsd_note: Remove checks of note->namesz. This function is only called if the note name is "FreeBSD", so checking the name size is unnecessary. bfd/ChangeLog: * elf.c (elfcore_grok_freebsd_note): Remove checks for namesz. (cherry picked from commit e330d4c033eab2e0e7206a29d6c11a9a59fd205b) --- bfd/ChangeLog | 4 ++++ bfd/elf.c | 10 ++-------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 6ac8b96c57a..ae8b25faae4 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,7 @@ +2022-04-01 John Baldwin + + * elf.c (elfcore_grok_freebsd_note): Remove checks for namesz. + 2022-03-18 Viorel Preoteasa PR 28924 diff --git a/bfd/elf.c b/bfd/elf.c index 82b53be99f9..a99149e50b3 100644 --- a/bfd/elf.c +++ b/bfd/elf.c @@ -11010,10 +11010,7 @@ elfcore_grok_freebsd_note (bfd *abfd, Elf_Internal_Note *note) return elfcore_grok_freebsd_psinfo (abfd, note); case NT_FREEBSD_THRMISC: - if (note->namesz == 8) - return elfcore_make_note_pseudosection (abfd, ".thrmisc", note); - else - return true; + return elfcore_make_note_pseudosection (abfd, ".thrmisc", note); case NT_FREEBSD_PROCSTAT_PROC: return elfcore_make_note_pseudosection (abfd, ".note.freebsdcore.proc", @@ -11031,10 +11028,7 @@ elfcore_grok_freebsd_note (bfd *abfd, Elf_Internal_Note *note) return elfcore_make_auxv_note_section (abfd, note, 4); case NT_X86_XSTATE: - if (note->namesz == 8) - return elfcore_grok_xstatereg (abfd, note); - else - return true; + return elfcore_grok_xstatereg (abfd, note); case NT_FREEBSD_PTLWPINFO: return elfcore_make_note_pseudosection (abfd, ".note.freebsdcore.lwpinfo", -- 2.47.2