From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf1-x435.google.com (mail-pf1-x435.google.com [IPv6:2607:f8b0:4864:20::435]) by sourceware.org (Postfix) with ESMTPS id B0197382B3F2 for ; Wed, 7 Dec 2022 03:52:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org B0197382B3F2 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-pf1-x435.google.com with SMTP id t18so6084431pfq.13 for ; Tue, 06 Dec 2022 19:52:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-disposition:mime-version:message-id:subject:to:from:date :from:to:cc:subject:date:message-id:reply-to; bh=z1Y/76HnHjBlRdELGoB8q99FaEX5oC6oJY96us3yYn4=; b=qVJXYz2ANVvYCas6NkQrejodPtuvsZoe9kZ6/IvyLcnI9iccv9gsMlrebckA3rY9kj IxsJJlE0HpICTNWjWtHo4tbCW5/ERumH5f09dm97R2RwF7NYXWQnNaEPEKP+nhQJLpCN FmzEdmwvwL4jeEEDjvnESbBlvJFnDg6/tDFPIAZwLW78DuqVywWgdI41hTe6ppu8i2u8 eAwn/xe7g6VXxtWkxYDk73txVVGbXgO/FYK2nOFQND1aJSJE6Jrqb5bUmUMGpRgmvg8y 0q5P42+NYK3VT6Adh+upZHPN3hmISGH+Z00N5dzp1j3XshRiLlR36RnuukCoCsmltL04 cAmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=z1Y/76HnHjBlRdELGoB8q99FaEX5oC6oJY96us3yYn4=; b=sFCjkw8JqCY7e0Cd2SbnIwpp9Qkr5X4mi+R59GIulUOHCZl9S6gCJce6v3XSuDGmeg zwUp+yCf1dKR5MilQpA1OYpccZPFg2uLHLeyfklMzK0JQylxtWCs6Je9Wtz1GVpRjmAc EAwvV0AaFhlVlTbr1MyP/MdQ2RDQSZPoWapgKcXycCoxXHZIYEB64E0y8pNZZs2BFD3P B6A4A4i329HDgKZ+YQTvaNXwn/PtSnU6Vz6OB26euKQKHegPvp1Sb42jnxwDZLm+D9PI 8IuFIh6dqO8VWelhvYNgRmEOejbs13dXPdm8kl+UYrede0fQ3QablPJMArERJWsarzFl avPA== X-Gm-Message-State: ANoB5pnOKlv2bSUdW4J38X35oEfugwJqj6Gr8DbP+WV8YmaxIGix8bhy WVswIcfVxEZbS2QpoamUVAwKsFHUmeE= X-Google-Smtp-Source: AA0mqf6aEz7UzYKL3xBgL09Gj1ideWibPPfbz7oFHI0WKIi4ri1YJUyd8YVfAVgQwMZxNXZM2hhdEw== X-Received: by 2002:a63:ff5f:0:b0:46f:b6df:3107 with SMTP id s31-20020a63ff5f000000b0046fb6df3107mr63733758pgk.454.1670385177385; Tue, 06 Dec 2022 19:52:57 -0800 (PST) Received: from squeak.grove.modra.org ([2406:3400:51d:8cc0:2706:5eaf:b1a8:9a0d]) by smtp.gmail.com with ESMTPSA id n6-20020a17090a2fc600b001fb1de10a4dsm139275pjm.33.2022.12.06.19.52.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Dec 2022 19:52:57 -0800 (PST) Received: by squeak.grove.modra.org (Postfix, from userid 1000) id A6CC3114072E; Wed, 7 Dec 2022 14:22:54 +1030 (ACDT) Date: Wed, 7 Dec 2022 14:22:54 +1030 From: Alan Modra To: binutils@sourceware.org Subject: _bfd_elf_slurp_secondary_reloc_section sanity check Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Spam-Status: No, score=-3035.4 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: * elf.c (_bfd_elf_slurp_secondary_reloc_section): Sanity check section header against file size. Avoid overflow in reloc_count. diff --git a/bfd/elf.c b/bfd/elf.c index ac10715fa93..5548efc44e4 100644 --- a/bfd/elf.c +++ b/bfd/elf.c @@ -13154,6 +13154,7 @@ _bfd_elf_slurp_secondary_reloc_section (bfd * abfd, asection * relsec; bool result = true; bfd_vma (*r_sym) (bfd_vma); + ufile_ptr filesize; #if BFD_DEFAULT_TARGET_SIZE > 32 if (bfd_arch_bits_per_address (abfd) != 32) @@ -13167,6 +13168,7 @@ _bfd_elf_slurp_secondary_reloc_section (bfd * abfd, /* Discover if there are any secondary reloc sections associated with SEC. */ + filesize = bfd_get_file_size (abfd); for (relsec = abfd->sections; relsec != NULL; relsec = relsec->next) { Elf_Internal_Shdr * hdr = & elf_section_data (relsec)->this_hdr; @@ -13180,10 +13182,10 @@ _bfd_elf_slurp_secondary_reloc_section (bfd * abfd, bfd_byte * native_reloc; arelent * internal_relocs; arelent * internal_reloc; - unsigned int i; + size_t i; unsigned int entsize; unsigned int symcount; - unsigned int reloc_count; + bfd_size_type reloc_count; size_t amt; if (ebd->elf_info_to_howto == NULL) @@ -13195,6 +13197,15 @@ _bfd_elf_slurp_secondary_reloc_section (bfd * abfd, #endif entsize = hdr->sh_entsize; + if (filesize != 0 + && ((ufile_ptr) hdr->sh_offset > filesize + || hdr->sh_size > filesize - hdr->sh_offset)) + { + bfd_set_error (bfd_error_file_truncated); + result = false; + continue; + } + native_relocs = bfd_malloc (hdr->sh_size); if (native_relocs == NULL) { @@ -13268,7 +13279,7 @@ _bfd_elf_slurp_secondary_reloc_section (bfd * abfd, { _bfd_error_handler /* xgettext:c-format */ - (_("%pB(%pA): relocation %d has invalid symbol index %ld"), + (_("%pB(%pA): relocation %zu has invalid symbol index %lu"), abfd, sec, i, (long) r_sym (rela.r_info)); bfd_set_error (bfd_error_bad_value); internal_reloc->sym_ptr_ptr = -- Alan Modra Australia Development Lab, IBM