From 1fe9dc4519a86b856da7de0837366bbece82f2de Mon Sep 17 00:00:00 2001 From: Will Newton Date: Wed, 5 Nov 2014 15:24:30 +0000 Subject: [PATCH] bfd/elf-attrs.c: Fix possible infinite loop parsing attributes Handle the case of a zero length section or sub-section in _bfd_elf_parse_attributes and in doing so prevent an infinite loop in the parser. bfd/ChangeLog: 2014-11-06 Will Newton * elf-attrs.c (_bfd_elf_parse_attributes): Handle zero length sections and sub-sections. --- bfd/ChangeLog | 5 +++++ bfd/elf-attrs.c | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 16724b3cb5..7a57b1265f 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2014-11-06 Will Newton + + * elf-attrs.c (_bfd_elf_parse_attributes): Handle zero + length sections and sub-sections. + 2014-11-04 Nick Clifton PR binutils/17512 diff --git a/bfd/elf-attrs.c b/bfd/elf-attrs.c index cd0cbcaa55..6bc2944c7b 100644 --- a/bfd/elf-attrs.c +++ b/bfd/elf-attrs.c @@ -455,6 +455,8 @@ _bfd_elf_parse_attributes (bfd *abfd, Elf_Internal_Shdr * hdr) section_len = bfd_get_32 (abfd, p); p += 4; + if (section_len == 0) + break; if (section_len > len) section_len = len; len -= section_len; @@ -487,6 +489,8 @@ _bfd_elf_parse_attributes (bfd *abfd, Elf_Internal_Shdr * hdr) p += n; subsection_len = bfd_get_32 (abfd, p); p += 4; + if (subsection_len == 0) + break; if (subsection_len > section_len) subsection_len = section_len; section_len -= subsection_len;