From nobody Fri Feb 25 15:31:09 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4385B19CC794; Fri, 25 Feb 2022 15:31:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4K4tz15hTtz4WWV; Fri, 25 Feb 2022 15:31:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645803069; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qQD3iOietEkYA/TvEE9DUlW7sVwkjfFTQu6ohVdJBOk=; b=FWGQI0od58BCIlIEtzOwWEsLOnZhsz/6Cy/JSd+Vsyzkr0PII6rba8/vifd4CqjXDhZ8L5 V0stwgP2Rdq1x69LIuD9ZU9sUDgGF/kJEghvYT6dRcAuRhdi9Y/WvR5mw+7q6OLRZlTjx1 vaUTcfptVTS/hQ9mi97sC/Ro2k8rffRfkkWzApcXibSnkd4Ftd88tjafS8Rt5Ouy3TvNFD LN9uQeuo6Rd/gFuq22rJ6WTzMsAZEjJ6cUywRwS4Sk6oVaUNOpEdFHvM3zyKJ01taEjoX+ 8zkalburIIlV53Q33JJhgJ7EJmkCZp9fqNz7W4FMUOE8+yS7PyjYZK7kyIgWZw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4FA5D2229C; Fri, 25 Feb 2022 15:31:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21PFV9Po076298; Fri, 25 Feb 2022 15:31:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21PFV97Y076297; Fri, 25 Feb 2022 15:31:09 GMT (envelope-from git) Date: Fri, 25 Feb 2022 15:31:09 GMT Message-Id: <202202251531.21PFV97Y076297@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Eric van Gyzen Subject: git: 58135fbd8b68 - main - gzip: fix error handling in unxz List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vangyzen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 58135fbd8b68228678eb0ce38566aaf7ab1aad94 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645803069; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qQD3iOietEkYA/TvEE9DUlW7sVwkjfFTQu6ohVdJBOk=; b=qPqrwAMJYJKH0aMVlN7v/PVMe5lDfXKZwdahzaNq7u/2wHolgNO4IHD42zlfN/QkTd3Fo0 fzhfwkEUWlyCOyrtNgtdHz2dyjc1YkJp7zI7c25YIgF0G8tM6+MBkaqW74N/2F+HcGKPh2 gUQr+JrBeL04nCceH/syHQ1oZXyR8cd0iweprJ1b4Lknhr7bY8OL9cn5I6jjOfBe7LZs68 9u+BSgKcaG0oJmHk6aOkLYGOODg0pxL7+xLwcmWsT0Y+or/tqPo25ISYd7HXGrTldOrja3 DSFDyaQlCbGLK5vdbQNY3kk782faag6dDPGp/E+t0XbJDfpQUzwkpyc229SZmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645803069; a=rsa-sha256; cv=none; b=KF3N14563H+GBeje1W6H+errBN8d6lbQcTi8R7j6UNcBOuRGCzyssMpxINTJdoRGgkKuJh j9KiXFBikM9pBUhPdxxnkhXRf5aCMPDJ5r0DVygXG/8Wc/JrbPkEpuoUtg+TnJ2MKstd/X OgNDPFBL8qs8EtgZjNlD1fMTRe3UZ6D/GsFIWPjsPOpG9G9YNpUjqB5LeHvqTkWVZyX+0j IiBTXOIDaUM5NdOiUOQWy9CfXTDz3s+BPR6/XtsbCmbKerYjZRN6n/80I25cUoa+mdEeGh IH6cLVjBS4k+OszamXpLqAx5n85xGgpmXwu5wsC6lKoU6M5MFYzFiRGiF4WCBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by vangyzen: URL: https://cgit.FreeBSD.org/src/commit/?id=58135fbd8b68228678eb0ce38566aaf7ab1aad94 commit 58135fbd8b68228678eb0ce38566aaf7ab1aad94 Author: Eric van Gyzen AuthorDate: 2022-02-24 23:00:52 +0000 Commit: Eric van Gyzen CommitDate: 2022-02-25 15:30:29 +0000 gzip: fix error handling in unxz The result of fstat() was not checked. Furthermore, there was a redundant check of st.st_size. Fix both. Reported by: Coverity MFC after: 1 week Sponsored by: Dell EMC Isilon --- usr.bin/gzip/unxz.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/usr.bin/gzip/unxz.c b/usr.bin/gzip/unxz.c index b92bec8f39b0..246600fd657c 100644 --- a/usr.bin/gzip/unxz.c +++ b/usr.bin/gzip/unxz.c @@ -260,8 +260,7 @@ parse_indexes(xz_file_info *xfi, int src_fd) { struct stat st; - fstat(src_fd, &st); - if (st.st_size <= 0) { + if (fstat(src_fd, &st) != 0) { return true; }