From owner-svn-src-all@freebsd.org Fri Dec 11 22:52:17 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 395E94BDCAE; Fri, 11 Dec 2020 22:52:17 +0000 (UTC) (envelope-from rlibby@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ct5dX5lGJz3Gwf; Fri, 11 Dec 2020 22:52:16 +0000 (UTC) (envelope-from rlibby@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B436B1301B; Fri, 11 Dec 2020 22:52:12 +0000 (UTC) (envelope-from rlibby@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0BBMqCEv032138; Fri, 11 Dec 2020 22:52:12 GMT (envelope-from rlibby@FreeBSD.org) Received: (from rlibby@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0BBMqC0N032137; Fri, 11 Dec 2020 22:52:12 GMT (envelope-from rlibby@FreeBSD.org) Message-Id: <202012112252.0BBMqC0N032137@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rlibby set sender to rlibby@FreeBSD.org using -f From: Ryan Libby Date: Fri, 11 Dec 2020 22:52:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r368568 - head/sbin/savecore X-SVN-Group: head X-SVN-Commit-Author: rlibby X-SVN-Commit-Paths: head/sbin/savecore X-SVN-Commit-Revision: 368568 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.34 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: Fri, 11 Dec 2020 22:52:17 -0000 Author: rlibby Date: Fri Dec 11 22:52:12 2020 New Revision: 368568 URL: https://svnweb.freebsd.org/changeset/base/368568 Log: savecore: bail on write error even when decompressing Reviewed by: markj Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D27560 Modified: head/sbin/savecore/savecore.c Modified: head/sbin/savecore/savecore.c ============================================================================== --- head/sbin/savecore/savecore.c Fri Dec 11 22:52:08 2020 (r368567) +++ head/sbin/savecore/savecore.c Fri Dec 11 22:52:12 2020 (r368568) @@ -491,12 +491,12 @@ sparsefwrite(const char *buf, size_t nr, FILE *fp) static char *zbuf; static size_t zbufsize; -static size_t +static ssize_t GunzipWrite(z_stream *z, char *in, size_t insize, FILE *fp) { static bool firstblock = true; /* XXX not re-entrable/usable */ const size_t hdrlen = 10; - size_t nw = 0; + size_t nw = 0, w; int rv; z->next_in = in; @@ -520,18 +520,21 @@ GunzipWrite(z_stream *z, char *in, size_t insize, FILE logmsg(LOG_ERR, "decompression failed: %s", z->msg); return (-1); } - nw += sparsefwrite(zbuf, zbufsize - z->avail_out, fp); + w = sparsefwrite(zbuf, zbufsize - z->avail_out, fp); + if (w < zbufsize - z->avail_out) + return (-1); + nw += w; } while (z->avail_in > 0 && rv != Z_STREAM_END); return (nw); } -static size_t +static ssize_t ZstdWrite(ZSTD_DCtx *Zctx, char *in, size_t insize, FILE *fp) { ZSTD_inBuffer Zin; ZSTD_outBuffer Zout; - size_t nw = 0; + size_t nw = 0, w; int rv; Zin.src = in; @@ -547,7 +550,10 @@ ZstdWrite(ZSTD_DCtx *Zctx, char *in, size_t insize, FI ZSTD_getErrorName(rv)); return (-1); } - nw += sparsefwrite(zbuf, Zout.pos, fp); + w = sparsefwrite(zbuf, Zout.pos, fp); + if (w < Zout.pos) + return (-1); + nw += w; } while (Zin.pos < Zin.size && rv != 0); return (nw); @@ -558,7 +564,8 @@ DoRegularFile(int fd, off_t dumpsize, u_int sectorsize uint8_t compression, char *buf, const char *device, const char *filename, FILE *fp) { - size_t nr, nw, wl; + size_t nr, wl; + ssize_t nw; off_t dmpcnt, origsize; z_stream z; /* gzip */ ZSTD_DCtx *Zctx; /* zstd */ @@ -609,8 +616,8 @@ DoRegularFile(int fd, off_t dumpsize, u_int sectorsize nw = fwrite(buf, 1, wl, fp); else nw = sparsefwrite(buf, wl, fp); - if ((compression == KERNELDUMP_COMP_NONE && nw != wl) || - (compression != KERNELDUMP_COMP_NONE && nw < 0)) { + if (nw < 0 || (compression == KERNELDUMP_COMP_NONE && + (size_t)nw != wl)) { logmsg(LOG_ERR, "write error on %s file: %m", filename); logmsg(LOG_WARNING,