From: Nick Clifton <nickc@redhat.com>
Date: Mon, 3 Apr 2017 10:01:45 +0000 (+0100)
Subject: readelf: Update check for invalid word offsets in ARM unwind information.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f32ba72991d2406b21ab17edc234a2f3fa7fb23d;p=binutils-gdb.git

readelf: Update check for invalid word offsets in ARM unwind information.

	PR binutils/21343
	* readelf.c (get_unwind_section_word): Fix snafu checking for
	invalid word offsets in ARM unwind information.
---

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index eb836119e71..dee35e5f381 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,9 @@
+2017-04-03  Nick Clifton  <nickc@redhat.com>
+
+	PR binutils/21343
+	* readelf.c (get_unwind_section_word): Fix snafu checking for
+	invalid word offsets in ARM unwind information.
+
 2017-03-31  Pip Cet  <pipcet@gmail.com>
 
 	* NEWS: Use "WebAssembly" consistently.
diff --git a/binutils/readelf.c b/binutils/readelf.c
index 31a519bc180..47736d6e934 100644
--- a/binutils/readelf.c
+++ b/binutils/readelf.c
@@ -8053,9 +8053,9 @@ get_unwind_section_word (struct arm_unw_aux_info *  aux,
     return FALSE;
 
   /* If the offset is invalid then fail.  */
-  if (word_offset > (sec->sh_size - 4)
-      /* PR 18879 */
-      || (sec->sh_size < 5 && word_offset >= sec->sh_size)
+  if (/* PR 21343 *//* PR 18879 */
+      sec->sh_size < 4
+      || word_offset > (sec->sh_size - 4)
       || ((bfd_signed_vma) word_offset) < 0)
     return FALSE;