From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pl1-x62c.google.com (mail-pl1-x62c.google.com [IPv6:2607:f8b0:4864:20::62c]) by sourceware.org (Postfix) with ESMTPS id 7328C384AB47 for ; Thu, 18 Apr 2024 00:54:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7328C384AB47 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 7328C384AB47 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::62c ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713401657; cv=none; b=J6qlp97XYSiHvQTHiPG2Ff1Ucf5g3b5BP8rGCBQ921Ju5FE6ZeczTXzCV88palILcm1V/wqx1GwMQruGYOD4TeBb50StKXwBpEsTwEGbqsU55h/RuGjpSlfz0PthYGs1tZv4Luei84yowsNSmwdH66k6XPNou09xt01Mo/ywnC8= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713401657; c=relaxed/simple; bh=P+TPXaR2lCh8rnYXNO74Wn3UVBLCdV6Sounwp8Udv3g=; h=DKIM-Signature:Date:From:To:Subject:Message-ID:MIME-Version; b=jflnIuxuLTZc/mtq9Y/EI93rjJCZkQ16TtzchrDO67Mie67GcxDa1UVTTeDSHJq8+M1tPeceV7egCixm0ohU/m6IoXTNdrI/ZEziQA3AUhfND98bjLgiJPLriQlM23FfS+k7Ocjd7WLRDlK3+z/sCHD8KSui0ColCJUyWzTr1hw= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pl1-x62c.google.com with SMTP id d9443c01a7336-1e3ca546d40so2803145ad.3 for ; Wed, 17 Apr 2024 17:54:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713401652; x=1714006452; darn=sourceware.org; h=content-disposition:mime-version:message-id:subject:to:from:date :from:to:cc:subject:date:message-id:reply-to; bh=JT/ELqVhspxMgnB8lzCxW3RMBjLeqVRVWWLrKGCtouk=; b=Q5EoTa1TAZCJuWi+lJ2HvCVDyhCrmN2yEmGe0glMfTd3csIGTx0sFBMlpfsjBpjbQv syOogyQZuHeZHNEm69BYY12Ms+F//yn1puDxWAYZHZnj1hkA9dnXI3XWleTGk4gUO3Sb BzGegg3qUtdQQFPYNcRnzqcRilPhzJnm0JRGXh0MzCrFnLAW2hIkL/WEyKM4BqypBTD3 EMMEW3dLOEmPQ7YcY6E4vGHHQNVHXQJxvOyqB1NjOAN6Gejzrhwonp9QKrlZd1ExZtdV Q4FElLJH0QuuZAQZD5ItUuM8JIfHfpJLsMk0gcosyacv3NxVu3U/oygLJk2l2y6EbD2K +pbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713401652; x=1714006452; h=content-disposition:mime-version:message-id:subject:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=JT/ELqVhspxMgnB8lzCxW3RMBjLeqVRVWWLrKGCtouk=; b=mehnHjT7AMwis4xneiQ70lgoea6nwpiisCc5E+RpUJDJr866JNNWQqM88t3BHCyoKX XwpJzBjKQUyLihcyp1XzlJ5iosmunTp0wRmweoSODP5i36B/0Luo42900n/DPo/u6XM3 LUcVTKR0xTIXNEYqtUkLI5FERg163YlDU/dMoEgp1yUg7AvUJa9YgkXd6+nNelMGzF6m IUabqylvkS218xK6v886zK/wJBEwHUJ4iFcxWw6iVEtFfjxuSI96Ry9X1wqPLBNl82wT Ne/EYKY8DpTLKWeiVkRpkrGgQJ85xK0JWe2vAv5oK5MKV67GTvBu3Q66mkQJOyrz3HBj tqYQ== X-Gm-Message-State: AOJu0YwCmlX19HYCDKSyoASDPdvE1OdfIdKh9gQR8SHc+OgghUZIyy6G 286FRbR9Vw2SjnB+3qPaLpf8mV/+fsyYB9uvPEQtVA3K+CTf5xDyFXupXQ== X-Google-Smtp-Source: AGHT+IH2MLGOw4iIwAmz+RSOu3Ig57LUlZfKyAhK7AP6Eb2LPEfHGADvtQajXP8KqZ7uoe8n8SIpCw== X-Received: by 2002:a17:903:2290:b0:1e2:23b9:eb24 with SMTP id b16-20020a170903229000b001e223b9eb24mr1539206plh.33.1713401652101; Wed, 17 Apr 2024 17:54:12 -0700 (PDT) Received: from squeak.grove.modra.org ([2406:3400:51d:8cc0:e156:fdda:9910:2a6e]) by smtp.gmail.com with ESMTPSA id f8-20020a170902684800b001e83a70d774sm263241pln.187.2024.04.17.17.54.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Apr 2024 17:54:11 -0700 (PDT) Received: by squeak.grove.modra.org (Postfix, from userid 1000) id A6E611140D14; Thu, 18 Apr 2024 10:24:09 +0930 (ACST) Date: Thu, 18 Apr 2024 10:24:09 +0930 From: Alan Modra To: binutils@sourceware.org Subject: Re: Fix address violations when reading corrupt VMS records Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Spam-Status: No, score=-3033.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: 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. diff --git a/bfd/vms-alpha.c b/bfd/vms-alpha.c index 8b5e3c21ac6..404638cf3d9 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"), -- Alan Modra Australia Development Lab, IBM