From: Alan Modra <amodra@gmail.com>
Date: Sat, 1 Jan 2022 03:23:06 +0000 (+1030)
Subject: ubsan: bfd_mach_o_build_commands shift exponent 64 is too large
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fcec5debef3f23dd0024a4501609353676d7dc50;p=binutils-gdb.git

ubsan: bfd_mach_o_build_commands shift exponent 64 is too large

	* mach-o.c (bfd_mach_o_read_section_32): Limit alignment further.
	(bfd_mach_o_read_section_64): Likewise.
---

diff --git a/bfd/mach-o.c b/bfd/mach-o.c
index d90ea3c28ce..af5ce024a0f 100644
--- a/bfd/mach-o.c
+++ b/bfd/mach-o.c
@@ -3653,12 +3653,12 @@ bfd_mach_o_read_section_32 (bfd *abfd, unsigned long prot)
   section->offset = bfd_h_get_32 (abfd, raw.offset);
   section->align = bfd_h_get_32 (abfd, raw.align);
   /* PR 17512: file: 0017eb76.  */
-  if (section->align > 64)
+  if (section->align >= 31)
     {
       _bfd_error_handler
-	(_("bfd_mach_o_read_section_32: overlarge alignment value: %#lx, "
-	   "using 32 instead"), section->align);
-      section->align = 32;
+	(_("bfd_mach_o_read_section_32: overlarge alignment value: %#lx"),
+	 section->align);
+      section->align = 30;
     }
   section->reloff = bfd_h_get_32 (abfd, raw.reloff);
   section->nreloc = bfd_h_get_32 (abfd, raw.nreloc);
@@ -3696,12 +3696,12 @@ bfd_mach_o_read_section_64 (bfd *abfd, unsigned long prot)
   section->size = bfd_h_get_64 (abfd, raw.size);
   section->offset = bfd_h_get_32 (abfd, raw.offset);
   section->align = bfd_h_get_32 (abfd, raw.align);
-  if (section->align > 64)
+  if (section->align >= 63)
     {
       _bfd_error_handler
-	(_("bfd_mach_o_read_section_64: overlarge alignment value: %#lx, "
-	   "using 32 instead"), section->align);
-      section->align = 32;
+	(_("bfd_mach_o_read_section_64: overlarge alignment value: %#lx"),
+	 section->align);
+      section->align = 62;
     }
   section->reloff = bfd_h_get_32 (abfd, raw.reloff);
   section->nreloc = bfd_h_get_32 (abfd, raw.nreloc);