d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

savecore: bail on write error even when decompressing

Browse Source 
Reviewed by:	markj
Sponsored by:	Dell EMC Isilon
Differential Revision:	https://reviews.freebsd.org/D27560
This commit is contained in:
Ryan Libby 2020-12-11 22:52:12 +00:00
parent ec5c07fcea
commit 61261ef589
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=368568
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
sbin/savecore/savecore.c
View File

@ -491,12 +491,12 @@ sparsefwrite(const char *buf, size_t nr, FILE *fp)
static char *zbuf; static char *zbuf;
static size_t zbufsize; static size_t zbufsize;
static size_t static ssize_t
GunzipWrite(z_stream *z, char *in, size_t insize, FILE *fp) GunzipWrite(z_stream *z, char *in, size_t insize, FILE *fp)
{ {
static bool firstblock = true; /* XXX not re-entrable/usable */ static bool firstblock = true; /* XXX not re-entrable/usable */
const size_t hdrlen = 10; const size_t hdrlen = 10;
size_t nw = 0; size_t nw = 0, w;
int rv; int rv;
z->next_in = in; z->next_in = in;
@ -520,18 +520,21 @@ GunzipWrite(z_stream *z, char *in, size_t insize, FILE *fp)
logmsg(LOG_ERR, "decompression failed: %s", z->msg); logmsg(LOG_ERR, "decompression failed: %s", z->msg);
return (-1); 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); } while (z->avail_in > 0 && rv != Z_STREAM_END);
return (nw); return (nw);
} }
static size_t static ssize_t
ZstdWrite(ZSTD_DCtx *Zctx, char *in, size_t insize, FILE *fp) ZstdWrite(ZSTD_DCtx *Zctx, char *in, size_t insize, FILE *fp)
{ {
ZSTD_inBuffer Zin; ZSTD_inBuffer Zin;
ZSTD_outBuffer Zout; ZSTD_outBuffer Zout;
size_t nw = 0; size_t nw = 0, w;
int rv; int rv;
Zin.src = in; Zin.src = in;
@ -547,7 +550,10 @@ ZstdWrite(ZSTD_DCtx *Zctx, char *in, size_t insize, FILE *fp)
ZSTD_getErrorName(rv)); ZSTD_getErrorName(rv));
return (-1); 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); } while (Zin.pos < Zin.size && rv != 0);
return (nw); return (nw);
@ -558,7 +564,8 @@ DoRegularFile(int fd, off_t dumpsize, u_int sectorsize, bool sparse,
uint8_t compression, char *buf, const char *device, uint8_t compression, char *buf, const char *device,
const char *filename, FILE *fp) const char *filename, FILE *fp)
{ {
size_t nr, nw, wl; size_t nr, wl;
ssize_t nw;
off_t dmpcnt, origsize; off_t dmpcnt, origsize;
z_stream z; /* gzip */ z_stream z; /* gzip */
ZSTD_DCtx *Zctx; /* zstd */ ZSTD_DCtx *Zctx; /* zstd */
@ -609,8 +616,8 @@ DoRegularFile(int fd, off_t dumpsize, u_int sectorsize, bool sparse,
nw = fwrite(buf, 1, wl, fp); nw = fwrite(buf, 1, wl, fp);
else else
nw = sparsefwrite(buf, wl, fp); nw = sparsefwrite(buf, wl, fp);
if ((compression == KERNELDUMP_COMP_NONE && nw != wl) || if (nw < 0 || (compression == KERNELDUMP_COMP_NONE &&
(compression != KERNELDUMP_COMP_NONE && nw < 0)) { (size_t)nw != wl)) {
logmsg(LOG_ERR, logmsg(LOG_ERR,
"write error on %s file: %m", filename); "write error on %s file: %m", filename);
logmsg(LOG_WARNING, logmsg(LOG_WARNING,