PR23806, NULL pointer dereference in merge_strings

	PR 23806
	* merge.c (_bfd_add_merge_section): Don't attempt to merge
	sections with ridiculously large alignments.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 1f3fc1c..c5f7ec7 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,11 @@
 2018-10-23  Alan Modra  <amodra@gmail.com>
 
+       PR 23806
+       * merge.c (_bfd_add_merge_section): Don't attempt to merge
+       sections with ridiculously large alignments.
+
+2018-10-23  Alan Modra  <amodra@gmail.com>
+
        PR 23805
        * elflink.c (elf_link_input_bfd): Don't segfault on finding
        STT_TLS symbols without any TLS sections.  Instead, change the

diff --git a/bfd/merge.c b/bfd/merge.c
index 5e3bba0..7de0c88 100644 (file)
--- a/bfd/merge.c
+++ b/bfd/merge.c
@@ -24,6 +24,7 @@
    as used in ELF SHF_MERGE.  */
 
 #include "sysdep.h"
+#include <limits.h>
 #include "bfd.h"
 #include "elf-bfd.h"
 #include "libbfd.h"
@@ -385,12 +386,18 @@ _bfd_add_merge_section (bfd *abfd, void **psinfo, asection *sec,
       return TRUE;
     }
 
-  align = sec->alignment_power;
-  if ((sec->entsize < (unsigned) 1 << align
+#ifndef CHAR_BIT
+#define CHAR_BIT 8
+#endif
+  if (sec->alignment_power >= sizeof (align) * CHAR_BIT)
+    return TRUE;
+
+  align = 1u << sec->alignment_power;
+  if ((sec->entsize < align
        && ((sec->entsize & (sec->entsize - 1))
           || !(sec->flags & SEC_STRINGS)))
-      || (sec->entsize > (unsigned) 1 << align
-         && (sec->entsize & (((unsigned) 1 << align) - 1))))
+      || (sec->entsize > align
+         && (sec->entsize & (align - 1))))
     {
       /* Sanity check.  If string character size is smaller than
         alignment, then we require character size to be a power