From owner-svn-src-all@freebsd.org Wed Mar 11 01:27:01 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 84AA52764B7; Wed, 11 Mar 2020 01:27:01 +0000 (UTC) (envelope-from cse.cem@gmail.com) Received: from mail-oi1-f176.google.com (mail-oi1-f176.google.com [209.85.167.176]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48cZ7R4gs0z48hV; Wed, 11 Mar 2020 01:26:59 +0000 (UTC) (envelope-from cse.cem@gmail.com) Received: by mail-oi1-f176.google.com with SMTP id r7so285276oij.0; Tue, 10 Mar 2020 18:26:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:reply-to :from:date:message-id:subject:to:cc; bh=qQK+4fLkB3gEGiBGahPc29gTFftRN+mv2eh/7T9pCdc=; b=O2Mlr531r34DRVBnr2jO5LMJ4eADzoGMmaofqGXQnNKOxp1UkRlso2zDK+AV89pIJH PUhqtcXz+6TNwL85jd8OnmJQmyE1HAQLNNfhg6cOPOcnbHdUxrch8V3/FjjxKm/AWLEF d8DPFC54Ey+Pi5NJ0UfR4TCOtPOUVFiXFr/PtxUn3L2DqN9IQeD95Sx8iuDIlDc+25Hk FiT+vkXoB3U73SIzyK45Vd9sEK3FJY8JBmdzlc6YBHRLzy4Mp6kDSxwpynyT8siZxWmk c2OfTOt80IOXhGWoYkAS5C7BH0MtDVmu/vVh0oPRq1mFpIceXAOr6pylq5XHD3KnDPZs KlbQ== X-Gm-Message-State: ANhLgQ2p+GRcXo0LeGionKYntcd3+HLlYNqpdxB661m59IwzMuYjO2xk hRzuE2WtavswI5M2lq0FmRr1RGMp X-Google-Smtp-Source: ADFU+vu5uWMDLKvXP/f2a+of7YYp4FD2BgpHHLlR4gSamKrG+S3onKiaXnNkrLD6ojeGGOuMX3BQ5w== X-Received: by 2002:a05:6808:3d0:: with SMTP id o16mr347889oie.12.1583890018050; Tue, 10 Mar 2020 18:26:58 -0700 (PDT) Received: from mail-ot1-f41.google.com (mail-ot1-f41.google.com. [209.85.210.41]) by smtp.gmail.com with ESMTPSA id f7sm5840642otq.25.2020.03.10.18.26.57 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 10 Mar 2020 18:26:57 -0700 (PDT) Received: by mail-ot1-f41.google.com with SMTP id a9so291257otl.6; Tue, 10 Mar 2020 18:26:57 -0700 (PDT) X-Received: by 2002:a9d:264:: with SMTP id 91mr492003otb.216.1583890017346; Tue, 10 Mar 2020 18:26:57 -0700 (PDT) MIME-Version: 1.0 References: <201711210814.vAL8EUgM047088@repo.freebsd.org> In-Reply-To: <201711210814.vAL8EUgM047088@repo.freebsd.org> Reply-To: cem@freebsd.org From: Conrad Meyer Date: Tue, 10 Mar 2020 18:26:46 -0700 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r326052 - head/usr.bin/gzip To: Xin LI Cc: src-committers , svn-src-all , svn-src-head Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 48cZ7R4gs0z48hV X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of csecem@gmail.com designates 209.85.167.176 as permitted sender) smtp.mailfrom=csecem@gmail.com X-Spamd-Result: default: False [-3.01 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_NEQ_ENVFROM(0.00)[cem@freebsd.org,csecem@gmail.com]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[freebsd.org]; HAS_REPLYTO(0.00)[cem@freebsd.org]; RCVD_TLS_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; RCVD_COUNT_THREE(0.00)[4]; REPLYTO_ADDR_EQ_FROM(0.00)[]; TO_DN_ALL(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[176.167.85.209.list.dnswl.org : 127.0.5.0]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; IP_SCORE(-1.01)[ip: (-0.36), ipnet: 209.85.128.0/17(-2.98), asn: 15169(-1.65), country: US(-0.05)]; FORGED_SENDER(0.30)[cem@freebsd.org,csecem@gmail.com]; RWL_MAILSPIKE_POSSIBLE(0.00)[176.167.85.209.rep.mailspike.net : 127.0.0.17]; MIME_TRACE(0.00)[0:+]; R_DKIM_NA(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; TAGGED_FROM(0.00)[] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Mar 2020 01:27:01 -0000 Hi Xin Li, Sorry to reply to an old commit. On Tue, Nov 21, 2017 at 12:14 AM Xin LI wrote: > > Author: delphij > Date: Tue Nov 21 08:14:30 2017 > New Revision: 326052 > URL: https://svnweb.freebsd.org/changeset/base/326052 > > Log: > Support SIGINFO. > ... > --- head/usr.bin/gzip/unpack.c Tue Nov 21 07:35:29 2017 (r326051) > +++ head/usr.bin/gzip/unpack.c Tue Nov 21 08:14:30 2017 (r326052) > ... > @@ -152,6 +155,9 @@ unpack_parse_header(int in, int out, char *pre, size_t > ssize_t bytesread; /* Bytes read from the file */ > int i, j, thisbyte; > > + if (prelen > sizeof hdr) > + maybe_err("prelen too long"); This check should perhaps be >=, rather than >. > + > /* Prepend the header buffer if we already read some data */ > if (prelen != 0) > memcpy(hdr, pre, prelen); > @@ -160,6 +166,7 @@ unpack_parse_header(int in, int out, char *pre, size_t > bytesread = read(in, hdr + prelen, PACK_HEADER_LENGTH - prelen); In the case where prelen == sizeof(hdr), we invoke read(, pointer past end of hdr, 0) above. This should have no effect, but looks unintended, and tickles Coverity (CID 1383554). > if (bytesread < 0) > maybe_err("Error reading pack header"); Best, Conrad