op public repos

Blob

Date:: Wed May 22 11:06:33 2019 UTC
Message:: fix got_error_from_errno() arguments in inflate.c
Actions:: History | Blame | Raw File
1 /*
2  * Copyright (c) 2018 Stefan Sperling <stsp@openbsd.org>
3  *
4  * Permission to use, copy, modify, and distribute this software for any
5  * purpose with or without fee is hereby granted, provided that the above
6  * copyright notice and this permission notice appear in all copies.
7  *
8  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
9  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
10  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
11  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
12  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
13  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
14  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
15  */
16 
17 #include <sys/queue.h>
18 
19 #include <errno.h>
20 #include <stdio.h>
21 #include <stdlib.h>
22 #include <string.h>
23 #include <sha1.h>
24 #include <zlib.h>
25 #include <time.h>
26 
27 #include "got_error.h"
28 #include "got_object.h"
29 #include "got_path.h"
30 
31 #include "got_lib_inflate.h"
32 
33 #ifndef MIN
34 #define	MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
35 #endif
36 
37 const struct got_error *
38 got_inflate_init(struct got_inflate_buf *zb, uint8_t *outbuf, size_t bufsize)
39 {
40 	const struct got_error *err = NULL;
41 	int zerr;
42 
43 	memset(&zb->z, 0, sizeof(zb->z));
44 
45 	zb->z.zalloc = Z_NULL;
46 	zb->z.zfree = Z_NULL;
47 	zerr = inflateInit(&zb->z);
48 	if (zerr != Z_OK) {
49 		if  (zerr == Z_ERRNO)
50 			return got_error_from_errno("inflateInit");
51 		if  (zerr == Z_MEM_ERROR) {
52 			errno = ENOMEM;
53 			return got_error_from_errno("inflateInit");
54 		}
55 		return got_error(GOT_ERR_DECOMPRESSION);
56 	}
57 
58 	zb->inlen = zb->outlen = bufsize;
59 
60 	zb->inbuf = calloc(1, zb->inlen);
61 	if (zb->inbuf == NULL) {
62 		err = got_error_from_errno("calloc");
63 		goto done;
64 	}
65 
66 	zb->flags = 0;
67 	if (outbuf == NULL) {
68 		zb->outbuf = calloc(1, zb->outlen);
69 		if (zb->outbuf == NULL) {
70 			err = got_error_from_errno("calloc");
71 			goto done;
72 		}
73 		zb->flags |= GOT_INFLATE_F_OWN_OUTBUF;
74 	} else
75 		zb->outbuf = outbuf;
76 
77 done:
78 	if (err)
79 		got_inflate_end(zb);
80 	return err;
81 }
82 
83 const struct got_error *
84 got_inflate_read(struct got_inflate_buf *zb, FILE *f, size_t *outlenp)
85 {
86 	size_t last_total_out = zb->z.total_out;
87 	z_stream *z = &zb->z;
88 	int ret = Z_ERRNO;
89 
90 	z->next_out = zb->outbuf;
91 	z->avail_out = zb->outlen;
92 
93 	*outlenp = 0;
94 	do {
95 		if (z->avail_in == 0) {
96 			size_t n = fread(zb->inbuf, 1, zb->inlen, f);
97 			if (n == 0) {
98 				if (ferror(f))
99 					return got_ferror(f, GOT_ERR_IO);
100 				/* EOF */
101 				ret = Z_STREAM_END;
102 				break;
103 			}
104 			z->next_in = zb->inbuf;
105 			z->avail_in = n;
106 		}
107 		ret = inflate(z, Z_SYNC_FLUSH);
108 	} while (ret == Z_OK && z->avail_out > 0);
109 
110 	if (ret == Z_OK) {
111 		zb->flags |= GOT_INFLATE_F_HAVE_MORE;
112 	} else {
113 		if (ret != Z_STREAM_END)
114 			return got_error(GOT_ERR_DECOMPRESSION);
115 		zb->flags &= ~GOT_INFLATE_F_HAVE_MORE;
116 	}
117 
118 	*outlenp = z->total_out - last_total_out;
119 	return NULL;
120 }
121 
122 const struct got_error *
123 got_inflate_read_fd(struct got_inflate_buf *zb, int fd, size_t *outlenp)
124 {
125 	size_t last_total_out = zb->z.total_out;
126 	z_stream *z = &zb->z;
127 	int ret = Z_ERRNO;
128 
129 	z->next_out = zb->outbuf;
130 	z->avail_out = zb->outlen;
131 
132 	*outlenp = 0;
133 	do {
134 		if (z->avail_in == 0) {
135 			ssize_t n = read(fd, zb->inbuf, zb->inlen);
136 			if (n < 0)
137 				return got_error_from_errno("read");
138 			else if (n == 0) {
139 				/* EOF */
140 				ret = Z_STREAM_END;
141 				break;
142 			}
143 			z->next_in = zb->inbuf;
144 			z->avail_in = n;
145 		}
146 		ret = inflate(z, Z_SYNC_FLUSH);
147 	} while (ret == Z_OK && z->avail_out > 0);
148 
149 	if (ret == Z_OK) {
150 		zb->flags |= GOT_INFLATE_F_HAVE_MORE;
151 	} else {
152 		if (ret != Z_STREAM_END)
153 			return got_error(GOT_ERR_DECOMPRESSION);
154 		zb->flags &= ~GOT_INFLATE_F_HAVE_MORE;
155 	}
156 
157 	*outlenp = z->total_out - last_total_out;
158 	return NULL;
159 }
160 
161 const struct got_error *
162 got_inflate_read_mmap(struct got_inflate_buf *zb, uint8_t *map, size_t offset,
163     size_t len, size_t *outlenp, size_t *consumed)
164 {
165 	size_t last_total_out = zb->z.total_out;
166 	z_stream *z = &zb->z;
167 	int ret = Z_ERRNO;
168 
169 	z->next_out = zb->outbuf;
170 	z->avail_out = zb->outlen;
171 
172 	*outlenp = 0;
173 	*consumed = 0;
174 
175 	do {
176 		size_t last_total_in = zb->z.total_in;
177 		if (z->avail_in == 0) {
178 			if (len == 0) {
179 				/* EOF */
180 				ret = Z_STREAM_END;
181 				break;
182 			}
183 			z->next_in = map + offset + *consumed;
184 			z->avail_in = MIN(zb->inlen, len);
185 			len -= z->avail_in;
186 		}
187 		ret = inflate(z, Z_SYNC_FLUSH);
188 		*consumed += z->total_in - last_total_in;
189 	} while (ret == Z_OK && z->avail_out > 0);
190 
191 	if (ret == Z_OK) {
192 		zb->flags |= GOT_INFLATE_F_HAVE_MORE;
193 	} else {
194 		if (ret != Z_STREAM_END)
195 			return got_error(GOT_ERR_DECOMPRESSION);
196 		zb->flags &= ~GOT_INFLATE_F_HAVE_MORE;
197 	}
198 
199 	*outlenp = z->total_out - last_total_out;
200 	return NULL;
201 }
202 
203 void
204 got_inflate_end(struct got_inflate_buf *zb)
205 {
206 	free(zb->inbuf);
207 	if (zb->flags & GOT_INFLATE_F_OWN_OUTBUF)
208 		free(zb->outbuf);
209 	inflateEnd(&zb->z);
210 }
211 
212 const struct got_error *
213 got_inflate_to_mem(uint8_t **outbuf, size_t *outlen, FILE *f)
214 {
215 	const struct got_error *err;
216 	size_t avail;
217 	struct got_inflate_buf zb;
218 	void *newbuf;
219 	int nbuf = 1;
220 
221 	*outbuf = malloc(GOT_INFLATE_BUFSIZE);
222 	if (*outbuf == NULL)
223 		return got_error_from_errno("malloc");
224 	err = got_inflate_init(&zb, *outbuf, GOT_INFLATE_BUFSIZE);
225 	if (err)
226 		return err;
227 
228 	*outlen = 0;
229 
230 	do {
231 		err = got_inflate_read(&zb, f, &avail);
232 		if (err)
233 			goto done;
234 		*outlen += avail;
235 		if (zb.flags & GOT_INFLATE_F_HAVE_MORE) {
236 			newbuf = reallocarray(*outbuf, ++nbuf,
237 			   GOT_INFLATE_BUFSIZE);
238 			if (newbuf == NULL) {
239 				err = got_error_from_errno("reallocarray");
240 				free(*outbuf);
241 				*outbuf = NULL;
242 				*outlen = 0;
243 				goto done;
244 			}
245 			*outbuf = newbuf;
246 			zb.outbuf = newbuf + *outlen;
247 			zb.outlen = (nbuf * GOT_INFLATE_BUFSIZE) - *outlen;
248 		}
249 	} while (zb.flags & GOT_INFLATE_F_HAVE_MORE);
250 
251 done:
252 	got_inflate_end(&zb);
253 	return err;
254 }
255 
256 const struct got_error *
257 got_inflate_to_mem_fd(uint8_t **outbuf, size_t *outlen, int infd)
258 {
259 	const struct got_error *err;
260 	size_t avail;
261 	struct got_inflate_buf zb;
262 	void *newbuf;
263 	int nbuf = 1;
264 
265 	*outbuf = malloc(GOT_INFLATE_BUFSIZE);
266 	if (*outbuf == NULL)
267 		return got_error_from_errno("malloc");
268 	err = got_inflate_init(&zb, *outbuf, GOT_INFLATE_BUFSIZE);
269 	if (err)
270 		goto done;
271 
272 	*outlen = 0;
273 
274 	do {
275 		err = got_inflate_read_fd(&zb, infd, &avail);
276 		if (err)
277 			goto done;
278 		*outlen += avail;
279 		if (zb.flags & GOT_INFLATE_F_HAVE_MORE) {
280 			newbuf = reallocarray(*outbuf, ++nbuf,
281 			    GOT_INFLATE_BUFSIZE);
282 			if (newbuf == NULL) {
283 				err = got_error_from_errno("reallocarray");
284 				free(*outbuf);
285 				*outbuf = NULL;
286 				*outlen = 0;
287 				goto done;
288 			}
289 			*outbuf = newbuf;
290 			zb.outbuf = newbuf + *outlen;
291 			zb.outlen = (nbuf * GOT_INFLATE_BUFSIZE) - *outlen;
292 		}
293 	} while (zb.flags & GOT_INFLATE_F_HAVE_MORE);
294 
295 done:
296 	got_inflate_end(&zb);
297 	return err;
298 }
299 
300 const struct got_error *
301 got_inflate_to_mem_mmap(uint8_t **outbuf, size_t *outlen, uint8_t *map,
302     size_t offset, size_t len)
303 {
304 	const struct got_error *err;
305 	size_t avail, consumed;
306 	struct got_inflate_buf zb;
307 	void *newbuf;
308 	int nbuf = 1;
309 
310 	*outbuf = malloc(GOT_INFLATE_BUFSIZE);
311 	if (*outbuf == NULL)
312 		return got_error_from_errno("malloc");
313 	err = got_inflate_init(&zb, *outbuf, GOT_INFLATE_BUFSIZE);
314 	if (err) {
315 		free(*outbuf);
316 		*outbuf = NULL;
317 		return err;
318 	}
319 
320 	*outlen = 0;
321 
322 	do {
323 		err = got_inflate_read_mmap(&zb, map, offset, len, &avail,
324 		    &consumed);
325 		if (err)
326 			goto done;
327 		offset += consumed;
328 		len -= consumed;
329 		*outlen += avail;
330 		if (len == 0)
331 			break;
332 		if (zb.flags & GOT_INFLATE_F_HAVE_MORE) {
333 			newbuf = reallocarray(*outbuf, ++nbuf,
334 			    GOT_INFLATE_BUFSIZE);
335 			if (newbuf == NULL) {
336 				err = got_error_from_errno("reallocarray");
337 				free(*outbuf);
338 				*outbuf = NULL;
339 				*outlen = 0;
340 				goto done;
341 			}
342 			*outbuf = newbuf;
343 			zb.outbuf = newbuf + *outlen;
344 			zb.outlen = (nbuf * GOT_INFLATE_BUFSIZE) - *outlen;
345 		}
346 	} while (zb.flags & GOT_INFLATE_F_HAVE_MORE);
347 done:
348 	got_inflate_end(&zb);
349 	return err;
350 }
351 
352 const struct got_error *
353 got_inflate_to_fd(size_t *outlen, FILE *infile, int outfd)
354 {
355 	const struct got_error *err = NULL;
356 	size_t avail;
357 	struct got_inflate_buf zb;
358 
359 	err = got_inflate_init(&zb, NULL, GOT_INFLATE_BUFSIZE);
360 	if (err)
361 		goto done;
362 
363 	*outlen = 0;
364 
365 	do {
366 		err = got_inflate_read(&zb, infile, &avail);
367 		if (err)
368 			goto done;
369 		if (avail > 0) {
370 			ssize_t n;
371 			n = write(outfd, zb.outbuf, avail);
372 			if (n != avail) {
373 				err = got_error_from_errno("write");
374 				goto done;
375 			}
376 			*outlen += avail;
377 		}
378 	} while (zb.flags & GOT_INFLATE_F_HAVE_MORE);
379 
380 done:
381 	if (err == NULL) {
382 		if (lseek(outfd, SEEK_SET, 0) == -1)
383 			err = got_error_from_errno("lseek");
384 	}
385 	got_inflate_end(&zb);
386 	return err;
387 }
388 
389 const struct got_error *
390 got_inflate_to_file(size_t *outlen, FILE *infile, FILE *outfile)
391 {
392 	const struct got_error *err;
393 	size_t avail;
394 	struct got_inflate_buf zb;
395 
396 	err = got_inflate_init(&zb, NULL, GOT_INFLATE_BUFSIZE);
397 	if (err)
398 		goto done;
399 
400 	*outlen = 0;
401 
402 	do {
403 		err = got_inflate_read(&zb, infile, &avail);
404 		if (err)
405 			goto done;
406 		if (avail > 0) {
407 			size_t n;
408 			n = fwrite(zb.outbuf, avail, 1, outfile);
409 			if (n != 1) {
410 				err = got_ferror(outfile, GOT_ERR_IO);
411 				goto done;
412 			}
413 			*outlen += avail;
414 		}
415 	} while (zb.flags & GOT_INFLATE_F_HAVE_MORE);
416 
417 done:
418 	if (err == NULL)
419 		rewind(outfile);
420 	got_inflate_end(&zb);
421 	return err;
422 }
423 
424 const struct got_error *
425 got_inflate_to_file_fd(size_t *outlen, int infd, FILE *outfile)
426 {
427 	const struct got_error *err;
428 	size_t avail;
429 	struct got_inflate_buf zb;
430 
431 	err = got_inflate_init(&zb, NULL, GOT_INFLATE_BUFSIZE);
432 	if (err)
433 		goto done;
434 
435 	*outlen = 0;
436 
437 	do {
438 		err = got_inflate_read_fd(&zb, infd, &avail);
439 		if (err)
440 			goto done;
441 		if (avail > 0) {
442 			size_t n;
443 			n = fwrite(zb.outbuf, avail, 1, outfile);
444 			if (n != 1) {
445 				err = got_ferror(outfile, GOT_ERR_IO);
446 				goto done;
447 			}
448 			*outlen += avail;
449 		}
450 	} while (zb.flags & GOT_INFLATE_F_HAVE_MORE);
451 
452 done:
453 	if (err == NULL)
454 		rewind(outfile);
455 	got_inflate_end(&zb);
456 	return err;
457 }
458 
459 const struct got_error *
460 got_inflate_to_file_mmap(size_t *outlen, uint8_t *map, size_t offset,
461     size_t len, FILE *outfile)
462 {
463 	const struct got_error *err;
464 	size_t avail;
465 	struct got_inflate_buf zb;
466 	size_t consumed;
467 
468 	err = got_inflate_init(&zb, NULL, GOT_INFLATE_BUFSIZE);
469 	if (err)
470 		goto done;
471 
472 	*outlen = 0;
473 
474 	do {
475 		err = got_inflate_read_mmap(&zb, map, offset, len, &avail,
476 		    &consumed);
477 		if (err)
478 			goto done;
479 		offset += consumed;
480 		len -= consumed;
481 		if (avail > 0) {
482 			size_t n;
483 			n = fwrite(zb.outbuf, avail, 1, outfile);
484 			if (n != 1) {
485 				err = got_ferror(outfile, GOT_ERR_IO);
486 				goto done;
487 			}
488 			*outlen += avail;
489 		}
490 	} while (zb.flags & GOT_INFLATE_F_HAVE_MORE);
491 
492 done:
493 	if (err == NULL)
494 		rewind(outfile);
495 	got_inflate_end(&zb);
496 	return err;
497 }