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.

Cherry-picked f32ba72991d2406b21ab17edc234a2f3fa7fb23d

Change-Id: I8e0b7cb2447d915a7d084f91d7dadd6756f9f843
Signed-off-by: Sangmin Seo <sangmin7.seo@samsung.com>

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index b92bf46..edfdc02 100644 (file)
--- 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.
+
 2016-08-03  Tristan Gingold  <gingold@adacore.com>
 
        * configure: Regenerate.

diff --git a/binutils/readelf.c b/binutils/readelf.c
index 274ddd1..9a515ff 100644 (file)
--- a/binutils/readelf.c
+++ b/binutils/readelf.c
@@ -7738,9 +7738,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;