diff options
| author | Alan Modra <amodra@gmail.com> | 2024-04-17 22:28:23 +0930 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2024-04-18 10:31:59 +0930 |
| commit | ebf18671351d94185823d364b75369abc1baba31 (patch) | |
| tree | ea1c9c07984d1000f224885e2587c62dd8f74dfa /bfd | |
| parent | ee19a4725c01f4924657a1d6f09f0e4dcd6bba17 (diff) | |
| download | gdb-ebf18671351d94185823d364b75369abc1baba31.zip gdb-ebf18671351d94185823d364b75369abc1baba31.tar.gz gdb-ebf18671351d94185823d364b75369abc1baba31.tar.bz2 | |
Re: Fix address violations when reading corrupt VMS records
Fixes error reports about the length of EEOM records produced by gas.
PR 21618
* vms-alpha.c (evax_bfd_print_emh): Don't read subtyp if short
record. Consolidate error messages.
(evax_bfd_print_eeom): Allow length 10 record.
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/vms-alpha.c | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/bfd/vms-alpha.c b/bfd/vms-alpha.c index 8b5e3c2..404638c 100644 --- a/bfd/vms-alpha.c +++ b/bfd/vms-alpha.c @@ -6110,20 +6110,23 @@ static void evax_bfd_print_emh (FILE *file, unsigned char *rec, unsigned int rec_len) { struct vms_emh_common *emh = (struct vms_emh_common *)rec; - unsigned int subtype; + int subtype = -1; int extra; - subtype = (unsigned) bfd_getl16 (emh->subtyp); + if (rec_len >= sizeof (*emh)) + subtype = bfd_getl16 (emh->subtyp); /* xgettext:c-format */ - fprintf (file, _(" EMH %u (len=%u): "), subtype, rec_len); + fprintf (file, _(" EMH %d (len=%u): "), subtype, rec_len); /* PR 21618: Check for invalid lengths. */ - if (rec_len < sizeof (* emh)) + if (rec_len < sizeof (*emh)) { - fprintf (file, _(" Error: The length is less than the length of an EMH record\n")); + fprintf (file, _(" Error: %s min length is %u\n"), + "EMH", (unsigned) sizeof (*emh)); return; } + extra = rec_len - sizeof (struct vms_emh_common); switch (subtype) @@ -6138,7 +6141,8 @@ evax_bfd_print_emh (FILE *file, unsigned char *rec, unsigned int rec_len) /* PR 21840: Check for invalid lengths. */ if (rec_len < sizeof (* mhd)) { - fprintf (file, _(" Error: The record length is less than the size of an EMH_MHD record\n")); + fprintf (file, _(" Error: %s min length is %u\n"), + "EMH_MHD", (unsigned) sizeof (*mhd)); return; } fprintf (file, _("Module header\n")); @@ -6214,9 +6218,10 @@ evax_bfd_print_eeom (FILE *file, unsigned char *rec, unsigned int rec_len) fprintf (file, _(" EEOM (len=%u):\n"), rec_len); /* PR 21618: Check for invalid lengths. */ - if (rec_len < sizeof (* eeom)) + if (rec_len < 10) { - fprintf (file, _(" Error: The length is less than the length of an EEOM record\n")); + fprintf (file, _(" Error: %s min length is %u\n"), + "EEOM", 10); return; } @@ -6224,7 +6229,8 @@ evax_bfd_print_eeom (FILE *file, unsigned char *rec, unsigned int rec_len) (unsigned)bfd_getl32 (eeom->total_lps)); fprintf (file, _(" completion code: %u\n"), (unsigned)bfd_getl16 (eeom->comcod)); - if (rec_len > 10) + + if (rec_len >= sizeof (*eeom)) { fprintf (file, _(" transfer addr flags: 0x%02x\n"), eeom->tfrflg); fprintf (file, _(" transfer addr psect: %u\n"), |