diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 2e71311f49..f7a58a88a0 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,9 @@
+2014-11-11  Nick Clifton  <nickc@redhat.com>
+
+	PR binutils/17531
+	* readelf.c (display_arm_attribute): Avoid reading off the end of
+	the buffer when processing a Tag_nodefaults.
+
 2014-11-10  Nick Clifton  <nickc@redhat.com>
 
 	PR binutils/17531
diff --git a/binutils/readelf.c b/binutils/readelf.c
index 91d5581565..083096090e 100644
--- a/binutils/readelf.c
+++ b/binutils/readelf.c
@@ -12054,7 +12054,9 @@ display_arm_attribute (unsigned char * p,
 	      break;
 
 	    case 64: /* Tag_nodefaults.  */
-	      p++;
+	      /* PR 17531: file: 001-505008-0.01.  */
+	      if (p < end)
+		p++;
 	      printf (_("True\n"));
 	      break;