PR28167, vms-alpha build_module_list

Message ID YQvJrXNRZkeCSWNP@squeak.grove.modra.org
State New
Headers show
Series
  • PR28167, vms-alpha build_module_list
Related show

Commit Message

Alan Modra via Binutils Aug. 5, 2021, 11:21 a.m.
PR 28167
	* vms-alpha.c (build_module_list): Malloc and free section contents.
	Don't read past end of section.


-- 
Alan Modra
Australia Development Lab, IBM

Patch

diff --git a/bfd/vms-alpha.c b/bfd/vms-alpha.c
index bd49b7af3c7..83a103ae63b 100644
--- a/bfd/vms-alpha.c
+++ b/bfd/vms-alpha.c
@@ -4796,18 +4796,14 @@  build_module_list (bfd *abfd)
       bfd_size_type size = bfd_section_size (dmt);
       unsigned char *ptr, *end;
 
-      ptr = (unsigned char *) bfd_alloc (abfd, size);
-      if (! ptr)
-	return NULL;
-
-      if (! bfd_get_section_contents (abfd, dmt, ptr, 0, size))
+      if (! bfd_malloc_and_get_section (abfd, dmt, &ptr))
 	return NULL;
 
       vms_debug2 ((2, "DMT\n"));
 
       end = ptr + size;
 
-      while (ptr < end)
+      while (end - ptr >= DBG_S_C_DMT_HEADER_SIZE)
 	{
 	  /* Each header declares a module with its start offset and size
 	     of debug info in the DST section, as well as the count of
@@ -4825,7 +4821,7 @@  build_module_list (bfd *abfd)
 	     As a consequence, the actual debug info in the DST section is
 	     shared and can be parsed multiple times; that doesn't seem to
 	     cause problems in practice.  */
-	  while (count-- > 0)
+	  while (count-- > 0 && end - ptr >= DBG_S_C_DMT_PSECT_SIZE)
 	    {
 	      int start = bfd_getl32 (ptr + DBG_S_L_DMT_PSECT_START);
 	      int length = bfd_getl32 (ptr + DBG_S_L_DMT_PSECT_LENGTH);
@@ -4842,6 +4838,7 @@  build_module_list (bfd *abfd)
 			   start, length));
 	    }
 	}
+      free (ptr);
     }
   else
     {