From patchwork Sun Mar 19 11:51:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Modra X-Patchwork-Id: 71749 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp688576wrt; Sun, 19 Mar 2023 04:51:17 -0700 (PDT) X-Google-Smtp-Source: AK7set+NU9ZzPQWJUun8X9ztGCmNu0u/B3g2xAhrd1Ovx9k666CuTL3CSY29cYu3TapfsKsnL7VW X-Received: by 2002:a17:906:1b5b:b0:933:2f45:bcd5 with SMTP id p27-20020a1709061b5b00b009332f45bcd5mr3649415ejg.24.1679226677447; Sun, 19 Mar 2023 04:51:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679226677; cv=none; d=google.com; s=arc-20160816; b=TZYLNKyzY/Y0svBvjoUWVJbXIBBsScWG83Rwhn1ut/qgLA+RO9WyI0F7om1Cj1sg6+ W1XLtj8fkxxojcE7sWDV/WRp14v0q++wg6Kzq7aSEds8+HVLBQexFxzOCpHJVIG6q/vl GEY73Lq4ElwBCssw9gMW6fsrq9O9HVmYOZSxULQZy1SIRQqfoQ+rodM8zCTPXW9ZItZ9 vQzESBmtkQE+yPG0HiPCncJ+5Z9TCOsxol23gAjoIufclZO9gyX2lYHBHEdA08+yTyjm rNHHmziQRKRfdW7gqETLeOvMTTHKKA5gkwJEVDn0dtase90ddqh8UeZbZXbUnAOrHeCJ nOWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-disposition:mime-version:message-id:subject:to:date :dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=S2IjCfeJRr/pRQBtUNUHeAz+/9BTQ36YauDI9qlHGs8=; b=VQDTF0SifmhojJ2ZeM8TjSlyF7NgUUGmYFRPrh9QjiY6E/XfdzM4fUdSZ1d6Uuc6K4 BFtzQYMkCiqAEh5wVSh5fto8KRZO25QtRBzZQsoo1Dp/0JQT9tS5d0jpdHJVzw/2InTy 7idMaoQ2tX7PjsWq2tpJ+HsrQGMThARtEY65t3yF7sEXEcyIJIYx3uNTedZYzk3O2LZj AQrw24VpH7b5dGUpM6DdQhgHDP4pTssf3+m6t6FrWTp+csQipTeOmnw6fOAie3dZ8kNL 3fxawr2JGbcIbykRDghXtbP0Da5/djgi+f5zqCOceD+o3dpNZKXV4efAOH8TiFKawIMw /jZQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=giCLue6m; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id b2-20020aa7c902000000b004fe96b95bbbsi7467543edt.570.2023.03.19.04.51.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Mar 2023 04:51:17 -0700 (PDT) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=giCLue6m; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 6D894385841D for ; Sun, 19 Mar 2023 11:51:16 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6D894385841D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1679226676; bh=S2IjCfeJRr/pRQBtUNUHeAz+/9BTQ36YauDI9qlHGs8=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=giCLue6mEN5WVnhYwR7h4SH6uaIKYbaYE+4vwxLV+vA4GIhBg5WvH5G7AL44q/mNF YDGuNDVPWvzDVFG4rSB8HVT8AEkcpjgQc6Vi5b9+fV1D0l9s7JshzpIHsDT1mkLCk/ qJ3Un0YXxZztQLK+zXSLopzjf4Ovuk+tti7J4dy4= X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-pj1-x102e.google.com (mail-pj1-x102e.google.com [IPv6:2607:f8b0:4864:20::102e]) by sourceware.org (Postfix) with ESMTPS id DF5573858D32 for ; Sun, 19 Mar 2023 11:51:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DF5573858D32 Received: by mail-pj1-x102e.google.com with SMTP id d13so9596005pjh.0 for ; Sun, 19 Mar 2023 04:51:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679226666; 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=S2IjCfeJRr/pRQBtUNUHeAz+/9BTQ36YauDI9qlHGs8=; b=snnBNGf9wDTVIsm6yxFypFPD6wkzKfq8oVZJXyuR0yVRuuOaU2HT2vV2IGQKQpG1+V SO0LX+919uWx9IIc0NhYWv2qo4GR6yfZExDUtsf7eTE3YriBedkV+b+M2v509+l8A8QZ vdlUHrQKCct1jCtl2aq7wdZhzRDlTOTBnzJNHTE9WxzhSfLhl/OlzT8tdtsKL5EsRltN ZPU3f2kOqH18VxRS5wBAriFU3qDK1UTCI1lBjxsq83hbgBVehlGFvTUVkeQ8gfi1ifiX fqL7nBCfnN9G3R4d3x3HkjJ2K29SK25UZv3oFDq3OGNt4wZT76Ji1s/Ef7bVgY0lMiB+ tsrQ== X-Gm-Message-State: AO0yUKV+3bWw0O2KUxzzv/iklW33t0CJ06XSG876ExU2xiOmHPpNhd55 C8t0HquSFLTAjg7bdiFf9wvcgROAu0I= X-Received: by 2002:a17:90a:7345:b0:23f:78d6:b5cc with SMTP id j5-20020a17090a734500b0023f78d6b5ccmr4981751pjs.38.1679226666125; Sun, 19 Mar 2023 04:51:06 -0700 (PDT) Received: from squeak.grove.modra.org (158.106.96.58.static.exetel.com.au. [58.96.106.158]) by smtp.gmail.com with ESMTPSA id 60-20020a17090a09c200b00234465cd2a7sm4167892pjo.56.2023.03.19.04.51.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Mar 2023 04:51:05 -0700 (PDT) Received: by squeak.grove.modra.org (Postfix, from userid 1000) id AC40F1142CE7; Sun, 19 Mar 2023 22:21:02 +1030 (ACDT) Date: Sun, 19 Mar 2023 22:21:02 +1030 To: binutils@sourceware.org Subject: ctf segfaults Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-3035.2 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 X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Alan Modra via Binutils From: Alan Modra Reply-To: Alan Modra Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org Sender: "Binutils" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760796792558184971?= X-GMAIL-MSGID: =?utf-8?q?1760796792558184971?= PR 30228 PR 30229 * ctf-open.c (ctf_bufopen_internal): Check for NULL cts_data. * ctf-archive.c (ctf_arc_bufpreamble, ctf_arc_bufopen): Likewise. diff --git a/libctf/ctf-archive.c b/libctf/ctf-archive.c index abae90da113..54c49b3edbb 100644 --- a/libctf/ctf-archive.c +++ b/libctf/ctf-archive.c @@ -402,8 +402,9 @@ ctf_arc_symsect_endianness (ctf_archive_t *arc, int little_endian) const ctf_preamble_t * ctf_arc_bufpreamble (const ctf_sect_t *ctfsect) { - if (ctfsect->cts_size > sizeof (uint64_t) && - (le64toh ((*(uint64_t *) ctfsect->cts_data)) == CTFA_MAGIC)) + if (ctfsect->cts_data != NULL + && ctfsect->cts_size > sizeof (uint64_t) + && (le64toh ((*(uint64_t *) ctfsect->cts_data)) == CTFA_MAGIC)) { struct ctf_archive *arc = (struct ctf_archive *) ctfsect->cts_data; return (const ctf_preamble_t *) ((char *) arc + le64toh (arc->ctfa_ctfs) @@ -424,8 +425,9 @@ ctf_arc_bufopen (const ctf_sect_t *ctfsect, const ctf_sect_t *symsect, int is_archive; ctf_dict_t *fp = NULL; - if (ctfsect->cts_size > sizeof (uint64_t) && - (le64toh ((*(uint64_t *) ctfsect->cts_data)) == CTFA_MAGIC)) + if (ctfsect->cts_data != NULL + && ctfsect->cts_size > sizeof (uint64_t) + && (le64toh ((*(uint64_t *) ctfsect->cts_data)) == CTFA_MAGIC)) { /* The archive is mmappable, so this operation is trivial. diff --git a/libctf/ctf-open.c b/libctf/ctf-open.c index 5bcf0dd9b76..35f635b6559 100644 --- a/libctf/ctf-open.c +++ b/libctf/ctf-open.c @@ -1354,7 +1354,8 @@ ctf_bufopen_internal (const ctf_sect_t *ctfsect, const ctf_sect_t *symsect, if (strsect != NULL && strsect->cts_data == NULL) return (ctf_set_open_errno (errp, ECTF_STRBAD)); - if (ctfsect->cts_size < sizeof (ctf_preamble_t)) + if (ctfsect->cts_data == NULL + || ctfsect->cts_size < sizeof (ctf_preamble_t)) return (ctf_set_open_errno (errp, ECTF_NOCTFBUF)); pp = (const ctf_preamble_t *) ctfsect->cts_data;