op public repos

Blob

Date:: Wed Apr 20 14:00:12 2022 UTC
Message:: inline struct got_object_id in struct got_object_qid Saves us from doing a malloc/free call for every item on the list. ok op@
Actions:: History | Blame | Raw File
1 /*
2  * Copyright (c) 2018, 2019, 2020 Stefan Sperling <stsp@openbsd.org>
3  * Copyright (c) 2020 Ori Bernstein <ori@openbsd.org>
4  *
5  * Permission to use, copy, modify, and distribute this software for any
6  * purpose with or without fee is hereby granted, provided that the above
7  * copyright notice and this permission notice appear in all copies.
8  *
9  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
10  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
11  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
12  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
13  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
14  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
15  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16  */
17 
18 #include <sys/types.h>
19 #include <sys/queue.h>
20 #include <sys/uio.h>
21 #include <sys/wait.h>
22 
23 #include <ctype.h>
24 #include <limits.h>
25 #include <signal.h>
26 #include <stdio.h>
27 #include <stdlib.h>
28 #include <string.h>
29 #include <errno.h>
30 #include <stdint.h>
31 #include <poll.h>
32 #include <imsg.h>
33 #include <sha1.h>
34 #include <unistd.h>
35 #include <zlib.h>
36 #include <time.h>
37 
38 #include "got_object.h"
39 #include "got_error.h"
40 #include "got_path.h"
41 #include "got_repository.h"
42 
43 #include "got_lib_sha1.h"
44 #include "got_lib_delta.h"
45 #include "got_lib_inflate.h"
46 #include "got_lib_object.h"
47 #include "got_lib_object_parse.h"
48 #include "got_lib_privsep.h"
49 #include "got_lib_pack.h"
50 
51 #ifndef MIN
52 #define	MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
53 #endif
54 
55 #ifndef nitems
56 #define nitems(_a)	(sizeof((_a)) / sizeof((_a)[0]))
57 #endif
58 
59 static const struct got_error *
60 poll_fd(int fd, int events, int timeout)
61 {
62 	struct pollfd pfd[1];
63 	struct timespec ts;
64 	sigset_t sigset;
65 	int n;
66 
67 	pfd[0].fd = fd;
68 	pfd[0].events = events;
69 
70 	ts.tv_sec = timeout;
71 	ts.tv_nsec = 0;
72 
73 	if (sigemptyset(&sigset) == -1)
74 		return got_error_from_errno("sigemptyset");
75 	if (sigaddset(&sigset, SIGWINCH) == -1)
76 		return got_error_from_errno("sigaddset");
77 
78 	n = ppoll(pfd, 1, timeout == INFTIM ? NULL : &ts, &sigset);
79 	if (n == -1)
80 		return got_error_from_errno("ppoll");
81 	if (n == 0)
82 		return got_error(GOT_ERR_TIMEOUT);
83 	if (pfd[0].revents & (POLLERR | POLLNVAL))
84 		return got_error_from_errno("poll error");
85 	if (pfd[0].revents & (events | POLLHUP))
86 		return NULL;
87 
88 	return got_error(GOT_ERR_INTERRUPT);
89 }
90 
91 static const struct got_error *
92 read_imsg(struct imsgbuf *ibuf)
93 {
94 	const struct got_error *err;
95 	size_t n;
96 
97 	err = poll_fd(ibuf->fd, POLLIN, INFTIM);
98 	if (err)
99 		return err;
100 
101 	n = imsg_read(ibuf);
102 	if (n == -1) {
103 		if (errno == EAGAIN) /* Could be a file-descriptor leak. */
104 			return got_error(GOT_ERR_PRIVSEP_NO_FD);
105 		return got_error(GOT_ERR_PRIVSEP_READ);
106 	}
107 	if (n == 0)
108 		return got_error(GOT_ERR_PRIVSEP_PIPE);
109 
110 	return NULL;
111 }
112 
113 const struct got_error *
114 got_privsep_wait_for_child(pid_t pid)
115 {
116 	int child_status;
117 
118 	if (waitpid(pid, &child_status, 0) == -1)
119 		return got_error_from_errno("waitpid");
120 
121 	if (!WIFEXITED(child_status))
122 		return got_error(GOT_ERR_PRIVSEP_DIED);
123 
124 	if (WEXITSTATUS(child_status) != 0)
125 		return got_error(GOT_ERR_PRIVSEP_EXIT);
126 
127 	return NULL;
128 }
129 
130 static const struct got_error *
131 recv_imsg_error(struct imsg *imsg, size_t datalen)
132 {
133 	struct got_imsg_error *ierr;
134 
135 	if (datalen != sizeof(*ierr))
136 		return got_error(GOT_ERR_PRIVSEP_LEN);
137 
138 	ierr = imsg->data;
139 	if (ierr->code == GOT_ERR_ERRNO) {
140 		static struct got_error serr;
141 		serr.code = GOT_ERR_ERRNO;
142 		serr.msg = strerror(ierr->errno_code);
143 		return &serr;
144 	}
145 
146 	return got_error(ierr->code);
147 }
148 
149 const struct got_error *
150 got_privsep_recv_imsg(struct imsg *imsg, struct imsgbuf *ibuf,
151     size_t min_datalen)
152 {
153 	const struct got_error *err;
154 	ssize_t n;
155 
156 	n = imsg_get(ibuf, imsg);
157 	if (n == -1)
158 		return got_error_from_errno("imsg_get");
159 
160 	while (n == 0) {
161 		err = read_imsg(ibuf);
162 		if (err)
163 			return err;
164 		n = imsg_get(ibuf, imsg);
165 		if (n == -1)
166 			return got_error_from_errno("imsg_get");
167 	}
168 
169 	if (imsg->hdr.len < IMSG_HEADER_SIZE + min_datalen)
170 		return got_error(GOT_ERR_PRIVSEP_LEN);
171 
172 	if (imsg->hdr.type == GOT_IMSG_ERROR) {
173 		size_t datalen = imsg->hdr.len - IMSG_HEADER_SIZE;
174 		return recv_imsg_error(imsg, datalen);
175 	}
176 
177 	return NULL;
178 }
179 
180 /* Attempt to send an error in an imsg. Complain on stderr as a last resort. */
181 void
182 got_privsep_send_error(struct imsgbuf *ibuf, const struct got_error *err)
183 {
184 	const struct got_error *poll_err;
185 	struct got_imsg_error ierr;
186 	int ret;
187 
188 	ierr.code = err->code;
189 	if (err->code == GOT_ERR_ERRNO)
190 		ierr.errno_code = errno;
191 	else
192 		ierr.errno_code = 0;
193 	ret = imsg_compose(ibuf, GOT_IMSG_ERROR, 0, 0, -1, &ierr, sizeof(ierr));
194 	if (ret == -1) {
195 		fprintf(stderr, "%s: error %d \"%s\": imsg_compose: %s\n",
196 		    getprogname(), err->code, err->msg, strerror(errno));
197 		return;
198 	}
199 
200 	poll_err = poll_fd(ibuf->fd, POLLOUT, INFTIM);
201 	if (poll_err) {
202 		fprintf(stderr, "%s: error %d \"%s\": poll: %s\n",
203 		    getprogname(), err->code, err->msg, poll_err->msg);
204 		return;
205 	}
206 
207 	ret = imsg_flush(ibuf);
208 	if (ret == -1) {
209 		fprintf(stderr, "%s: error %d \"%s\": imsg_flush: %s\n",
210 		    getprogname(), err->code, err->msg, strerror(errno));
211 		imsg_clear(ibuf);
212 		return;
213 	}
214 }
215 
216 static const struct got_error *
217 flush_imsg(struct imsgbuf *ibuf)
218 {
219 	const struct got_error *err;
220 
221 	err = poll_fd(ibuf->fd, POLLOUT, INFTIM);
222 	if (err)
223 		return err;
224 
225 	if (imsg_flush(ibuf) == -1) {
226 		imsg_clear(ibuf);
227 		return got_error_from_errno("imsg_flush");
228 	}
229 
230 	return NULL;
231 }
232 
233 const struct got_error *
234 got_privsep_flush_imsg(struct imsgbuf *ibuf)
235 {
236 	return flush_imsg(ibuf);
237 }
238 
239 const struct got_error *
240 got_privsep_send_stop(int fd)
241 {
242 	const struct got_error *err = NULL;
243 	struct imsgbuf ibuf;
244 
245 	imsg_init(&ibuf, fd);
246 
247 	if (imsg_compose(&ibuf, GOT_IMSG_STOP, 0, 0, -1, NULL, 0) == -1)
248 		return got_error_from_errno("imsg_compose STOP");
249 
250 	err = flush_imsg(&ibuf);
251 	return err;
252 }
253 
254 const struct got_error *
255 got_privsep_send_obj_req(struct imsgbuf *ibuf, int fd,
256     struct got_object_id *id)
257 {
258 	if (imsg_compose(ibuf, GOT_IMSG_OBJECT_REQUEST, 0, 0, fd,
259 	    id, sizeof(*id)) == -1)
260 		return got_error_from_errno("imsg_compose OBJECT_REQUEST");
261 
262 	return flush_imsg(ibuf);
263 }
264 
265 const struct got_error *
266 got_privsep_send_raw_obj_req(struct imsgbuf *ibuf, int fd,
267     struct got_object_id *id)
268 {
269 	if (imsg_compose(ibuf, GOT_IMSG_RAW_OBJECT_REQUEST, 0, 0, fd,
270 	    id, sizeof(*id)) == -1)
271 		return got_error_from_errno("imsg_compose RAW_OBJECT_REQUEST");
272 
273 	return flush_imsg(ibuf);
274 }
275 
276 const struct got_error *
277 got_privsep_send_raw_obj_outfd(struct imsgbuf *ibuf, int outfd)
278 {
279 	const struct got_error *err = NULL;
280 
281 	if (imsg_compose(ibuf, GOT_IMSG_RAW_OBJECT_OUTFD, 0, 0, outfd, NULL, 0)
282 	    == -1) {
283 		err = got_error_from_errno("imsg_compose RAW_OBJECT_OUTFD");
284 		close(outfd);
285 		return err;
286 	}
287 
288 	return flush_imsg(ibuf);
289 }
290 
291 const struct got_error *
292 got_privsep_send_raw_obj(struct imsgbuf *ibuf, off_t size, size_t hdrlen,
293     uint8_t *data)
294 {
295 	const struct got_error *err = NULL;
296 	struct got_imsg_raw_obj iobj;
297 	size_t len = sizeof(iobj);
298 	struct ibuf *wbuf;
299 
300 	iobj.hdrlen = hdrlen;
301 	iobj.size = size;
302 
303 	if (data && size + hdrlen <= GOT_PRIVSEP_INLINE_OBJECT_DATA_MAX)
304 		len += (size_t)size + hdrlen;
305 
306 	wbuf = imsg_create(ibuf, GOT_IMSG_RAW_OBJECT, 0, 0, len);
307 	if (wbuf == NULL) {
308 		err = got_error_from_errno("imsg_create RAW_OBJECT");
309 		return err;
310 	}
311 
312 	if (imsg_add(wbuf, &iobj, sizeof(iobj)) == -1) {
313 		err = got_error_from_errno("imsg_add RAW_OBJECT");
314 		ibuf_free(wbuf);
315 		return err;
316 	}
317 
318 	if (data && size + hdrlen <= GOT_PRIVSEP_INLINE_OBJECT_DATA_MAX) {
319 		if (imsg_add(wbuf, data, size + hdrlen) == -1) {
320 			err = got_error_from_errno("imsg_add RAW_OBJECT");
321 			ibuf_free(wbuf);
322 			return err;
323 		}
324 	}
325 
326 	wbuf->fd = -1;
327 	imsg_close(ibuf, wbuf);
328 
329 	return flush_imsg(ibuf);
330 }
331 
332 const struct got_error *
333 got_privsep_recv_raw_obj(uint8_t **outbuf, off_t *size, size_t *hdrlen,
334     struct imsgbuf *ibuf)
335 {
336 	const struct got_error *err = NULL;
337 	struct imsg imsg;
338 	struct got_imsg_raw_obj *iobj;
339 	size_t datalen;
340 
341 	*outbuf = NULL;
342 
343 	err = got_privsep_recv_imsg(&imsg, ibuf, 0);
344 	if (err)
345 		return err;
346 
347 	datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
348 
349 	switch (imsg.hdr.type) {
350 	case GOT_IMSG_RAW_OBJECT:
351 		if (datalen < sizeof(*iobj)) {
352 			err = got_error(GOT_ERR_PRIVSEP_LEN);
353 			break;
354 		}
355 		iobj = imsg.data;
356 		*size = iobj->size;
357 		*hdrlen = iobj->hdrlen;
358 
359 		if (datalen == sizeof(*iobj)) {
360 			/* Data has been written to file descriptor. */
361 			break;
362 		}
363 
364 		if (*size + *hdrlen > GOT_PRIVSEP_INLINE_OBJECT_DATA_MAX) {
365 			err = got_error(GOT_ERR_PRIVSEP_LEN);
366 			break;
367 		}
368 
369 		*outbuf = malloc(*size + *hdrlen);
370 		if (*outbuf == NULL) {
371 			err = got_error_from_errno("malloc");
372 			break;
373 		}
374 		memcpy(*outbuf, imsg.data + sizeof(*iobj), *size + *hdrlen);
375 		break;
376 	default:
377 		err = got_error(GOT_ERR_PRIVSEP_MSG);
378 		break;
379 	}
380 
381 	imsg_free(&imsg);
382 
383 	return err;
384 }
385 
386 const struct got_error *
387 got_privsep_send_commit_req(struct imsgbuf *ibuf, int fd,
388     struct got_object_id *id, int pack_idx)
389 {
390 	const struct got_error *err = NULL;
391 	struct got_imsg_packed_object iobj;
392 	void *data;
393 	size_t len;
394 
395 	if (pack_idx != -1) { /* commit is packed */
396 		iobj.idx = pack_idx;
397 		memcpy(iobj.id, id->sha1, sizeof(iobj.id));
398 		data = &iobj;
399 		len = sizeof(iobj);
400 	} else {
401 		data = id;
402 		len = sizeof(*id);
403 	}
404 
405 	if (imsg_compose(ibuf, GOT_IMSG_COMMIT_REQUEST, 0, 0, fd, data, len)
406 	    == -1) {
407 		err = got_error_from_errno("imsg_compose COMMIT_REQUEST");
408 		close(fd);
409 		return err;
410 	}
411 
412 	return flush_imsg(ibuf);
413 }
414 
415 const struct got_error *
416 got_privsep_send_tree_req(struct imsgbuf *ibuf, int fd,
417     struct got_object_id *id, int pack_idx)
418 {
419 	const struct got_error *err = NULL;
420 	struct ibuf *wbuf;
421 	size_t len;
422 
423 	if (pack_idx != -1)
424 		len = sizeof(struct got_imsg_packed_object);
425 	else
426 		len = sizeof(*id);
427 
428 	wbuf = imsg_create(ibuf, GOT_IMSG_TREE_REQUEST, 0, 0, len);
429 	if (wbuf == NULL)
430 		return got_error_from_errno("imsg_create TREE_REQUEST");
431 
432 	if (imsg_add(wbuf, id->sha1, SHA1_DIGEST_LENGTH) == -1) {
433 		err = got_error_from_errno("imsg_add TREE_REQUEST");
434 		ibuf_free(wbuf);
435 		return err;
436 	}
437 
438 	if (pack_idx != -1) { /* tree is packed */
439 		if (imsg_add(wbuf, &pack_idx, sizeof(pack_idx)) == -1) {
440 			err = got_error_from_errno("imsg_add TREE_REQUEST");
441 			ibuf_free(wbuf);
442 			return err;
443 		}
444 	}
445 
446 	wbuf->fd = fd;
447 	imsg_close(ibuf, wbuf);
448 
449 	return flush_imsg(ibuf);
450 }
451 
452 const struct got_error *
453 got_privsep_send_tag_req(struct imsgbuf *ibuf, int fd,
454     struct got_object_id *id, int pack_idx)
455 {
456 	struct got_imsg_packed_object iobj;
457 	void *data;
458 	size_t len;
459 
460 	if (pack_idx != -1) { /* tag is packed */
461 		iobj.idx = pack_idx;
462 		memcpy(iobj.id, id->sha1, sizeof(iobj.id));
463 		data = &iobj;
464 		len = sizeof(iobj);
465 	} else {
466 		data = id;
467 		len = sizeof(*id);
468 	}
469 
470 	if (imsg_compose(ibuf, GOT_IMSG_TAG_REQUEST, 0, 0, fd, data, len)
471 	    == -1)
472 		return got_error_from_errno("imsg_compose TAG_REQUEST");
473 
474 	return flush_imsg(ibuf);
475 }
476 
477 const struct got_error *
478 got_privsep_send_blob_req(struct imsgbuf *ibuf, int infd,
479     struct got_object_id *id, int pack_idx)
480 {
481 	const struct got_error *err = NULL;
482 	struct got_imsg_packed_object iobj;
483 	void *data;
484 	size_t len;
485 
486 	if (pack_idx != -1) { /* blob is packed */
487 		iobj.idx = pack_idx;
488 		memcpy(iobj.id, id->sha1, sizeof(iobj.id));
489 		data = &iobj;
490 		len = sizeof(iobj);
491 	} else {
492 		data = id;
493 		len = sizeof(*id);
494 	}
495 
496 	if (imsg_compose(ibuf, GOT_IMSG_BLOB_REQUEST, 0, 0, infd, data, len)
497 	    == -1) {
498 		err = got_error_from_errno("imsg_compose BLOB_REQUEST");
499 		close(infd);
500 		return err;
501 	}
502 
503 	return flush_imsg(ibuf);
504 }
505 
506 const struct got_error *
507 got_privsep_send_blob_outfd(struct imsgbuf *ibuf, int outfd)
508 {
509 	const struct got_error *err = NULL;
510 
511 	if (imsg_compose(ibuf, GOT_IMSG_BLOB_OUTFD, 0, 0, outfd, NULL, 0)
512 	    == -1) {
513 		err = got_error_from_errno("imsg_compose BLOB_OUTFD");
514 		close(outfd);
515 		return err;
516 	}
517 
518 	return flush_imsg(ibuf);
519 }
520 
521 static const struct got_error *
522 send_fd(struct imsgbuf *ibuf, int imsg_code, int fd)
523 {
524 	const struct got_error *err = NULL;
525 
526 	if (imsg_compose(ibuf, imsg_code, 0, 0, fd, NULL, 0) == -1) {
527 		err = got_error_from_errno("imsg_compose TMPFD");
528 		close(fd);
529 		return err;
530 	}
531 
532 	return flush_imsg(ibuf);
533 }
534 
535 const struct got_error *
536 got_privsep_send_tmpfd(struct imsgbuf *ibuf, int fd)
537 {
538 	return send_fd(ibuf, GOT_IMSG_TMPFD, fd);
539 }
540 
541 const struct got_error *
542 got_privsep_send_obj(struct imsgbuf *ibuf, struct got_object *obj)
543 {
544 	struct got_imsg_object iobj;
545 
546 	memcpy(iobj.id, obj->id.sha1, sizeof(iobj.id));
547 	iobj.type = obj->type;
548 	iobj.flags = obj->flags;
549 	iobj.hdrlen = obj->hdrlen;
550 	iobj.size = obj->size;
551 	if (iobj.flags & GOT_OBJ_FLAG_PACKED) {
552 		iobj.pack_offset = obj->pack_offset;
553 		iobj.pack_idx = obj->pack_idx;
554 	}
555 
556 	if (imsg_compose(ibuf, GOT_IMSG_OBJECT, 0, 0, -1, &iobj, sizeof(iobj))
557 	    == -1)
558 		return got_error_from_errno("imsg_compose OBJECT");
559 
560 	return flush_imsg(ibuf);
561 }
562 
563 const struct got_error *
564 got_privsep_send_fetch_req(struct imsgbuf *ibuf, int fd,
565     struct got_pathlist_head *have_refs, int fetch_all_branches,
566     struct got_pathlist_head *wanted_branches,
567     struct got_pathlist_head *wanted_refs, int list_refs_only, int verbosity)
568 {
569 	const struct got_error *err = NULL;
570 	struct ibuf *wbuf;
571 	size_t len;
572 	struct got_pathlist_entry *pe;
573 	struct got_imsg_fetch_request fetchreq;
574 
575 	memset(&fetchreq, 0, sizeof(fetchreq));
576 	fetchreq.fetch_all_branches = fetch_all_branches;
577 	fetchreq.list_refs_only = list_refs_only;
578 	fetchreq.verbosity = verbosity;
579 	TAILQ_FOREACH(pe, have_refs, entry)
580 		fetchreq.n_have_refs++;
581 	TAILQ_FOREACH(pe, wanted_branches, entry)
582 		fetchreq.n_wanted_branches++;
583 	TAILQ_FOREACH(pe, wanted_refs, entry)
584 		fetchreq.n_wanted_refs++;
585 	len = sizeof(struct got_imsg_fetch_request);
586 	if (len >= MAX_IMSGSIZE - IMSG_HEADER_SIZE) {
587 		close(fd);
588 		return got_error(GOT_ERR_NO_SPACE);
589 	}
590 
591 	if (imsg_compose(ibuf, GOT_IMSG_FETCH_REQUEST, 0, 0, fd,
592 	    &fetchreq, sizeof(fetchreq)) == -1)
593 		return got_error_from_errno(
594 		    "imsg_compose FETCH_SERVER_PROGRESS");
595 
596 	err = flush_imsg(ibuf);
597 	if (err) {
598 		close(fd);
599 		return err;
600 	}
601 	fd = -1;
602 
603 	TAILQ_FOREACH(pe, have_refs, entry) {
604 		const char *name = pe->path;
605 		size_t name_len = pe->path_len;
606 		struct got_object_id *id = pe->data;
607 
608 		len = sizeof(struct got_imsg_fetch_have_ref) + name_len;
609 		wbuf = imsg_create(ibuf, GOT_IMSG_FETCH_HAVE_REF, 0, 0, len);
610 		if (wbuf == NULL)
611 			return got_error_from_errno("imsg_create FETCH_HAVE_REF");
612 
613 		/* Keep in sync with struct got_imsg_fetch_have_ref! */
614 		if (imsg_add(wbuf, id->sha1, sizeof(id->sha1)) == -1) {
615 			err = got_error_from_errno("imsg_add FETCH_HAVE_REF");
616 			ibuf_free(wbuf);
617 			return err;
618 		}
619 		if (imsg_add(wbuf, &name_len, sizeof(name_len)) == -1) {
620 			err = got_error_from_errno("imsg_add FETCH_HAVE_REF");
621 			ibuf_free(wbuf);
622 			return err;
623 		}
624 		if (imsg_add(wbuf, name, name_len) == -1) {
625 			err = got_error_from_errno("imsg_add FETCH_HAVE_REF");
626 			ibuf_free(wbuf);
627 			return err;
628 		}
629 
630 		wbuf->fd = -1;
631 		imsg_close(ibuf, wbuf);
632 		err = flush_imsg(ibuf);
633 		if (err)
634 			return err;
635 	}
636 
637 	TAILQ_FOREACH(pe, wanted_branches, entry) {
638 		const char *name = pe->path;
639 		size_t name_len = pe->path_len;
640 
641 		len = sizeof(struct got_imsg_fetch_wanted_branch) + name_len;
642 		wbuf = imsg_create(ibuf, GOT_IMSG_FETCH_WANTED_BRANCH, 0, 0,
643 		    len);
644 		if (wbuf == NULL)
645 			return got_error_from_errno(
646 			    "imsg_create FETCH_WANTED_BRANCH");
647 
648 		/* Keep in sync with struct got_imsg_fetch_wanted_branch! */
649 		if (imsg_add(wbuf, &name_len, sizeof(name_len)) == -1) {
650 			err = got_error_from_errno(
651 			    "imsg_add FETCH_WANTED_BRANCH");
652 			ibuf_free(wbuf);
653 			return err;
654 		}
655 		if (imsg_add(wbuf, name, name_len) == -1) {
656 			err = got_error_from_errno(
657 			    "imsg_add FETCH_WANTED_BRANCH");
658 			ibuf_free(wbuf);
659 			return err;
660 		}
661 
662 		wbuf->fd = -1;
663 		imsg_close(ibuf, wbuf);
664 		err = flush_imsg(ibuf);
665 		if (err)
666 			return err;
667 	}
668 
669 	TAILQ_FOREACH(pe, wanted_refs, entry) {
670 		const char *name = pe->path;
671 		size_t name_len = pe->path_len;
672 
673 		len = sizeof(struct got_imsg_fetch_wanted_ref) + name_len;
674 		wbuf = imsg_create(ibuf, GOT_IMSG_FETCH_WANTED_REF, 0, 0,
675 		    len);
676 		if (wbuf == NULL)
677 			return got_error_from_errno(
678 			    "imsg_create FETCH_WANTED_REF");
679 
680 		/* Keep in sync with struct got_imsg_fetch_wanted_ref! */
681 		if (imsg_add(wbuf, &name_len, sizeof(name_len)) == -1) {
682 			err = got_error_from_errno(
683 			    "imsg_add FETCH_WANTED_REF");
684 			ibuf_free(wbuf);
685 			return err;
686 		}
687 		if (imsg_add(wbuf, name, name_len) == -1) {
688 			err = got_error_from_errno(
689 			    "imsg_add FETCH_WANTED_REF");
690 			ibuf_free(wbuf);
691 			return err;
692 		}
693 
694 		wbuf->fd = -1;
695 		imsg_close(ibuf, wbuf);
696 		err = flush_imsg(ibuf);
697 		if (err)
698 			return err;
699 	}
700 
701 
702 	return NULL;
703 
704 }
705 
706 const struct got_error *
707 got_privsep_send_fetch_outfd(struct imsgbuf *ibuf, int fd)
708 {
709 	return send_fd(ibuf, GOT_IMSG_FETCH_OUTFD, fd);
710 }
711 
712 const struct got_error *
713 got_privsep_recv_fetch_progress(int *done, struct got_object_id **id,
714     char **refname, struct got_pathlist_head *symrefs, char **server_progress,
715     off_t *packfile_size, uint8_t *pack_sha1, struct imsgbuf *ibuf)
716 {
717 	const struct got_error *err = NULL;
718 	struct imsg imsg;
719 	size_t datalen;
720 	struct got_imsg_fetch_symrefs *isymrefs = NULL;
721 	size_t n, remain;
722 	off_t off;
723 	int i;
724 
725 	*done = 0;
726 	*id = NULL;
727 	*refname = NULL;
728 	*server_progress = NULL;
729 	*packfile_size = 0;
730 	memset(pack_sha1, 0, SHA1_DIGEST_LENGTH);
731 
732 	err = got_privsep_recv_imsg(&imsg, ibuf, 0);
733 	if (err)
734 		return err;
735 
736 	datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
737 	switch (imsg.hdr.type) {
738 	case GOT_IMSG_ERROR:
739 		if (datalen < sizeof(struct got_imsg_error)) {
740 			err = got_error(GOT_ERR_PRIVSEP_LEN);
741 			break;
742 		}
743 		err = recv_imsg_error(&imsg, datalen);
744 		break;
745 	case GOT_IMSG_FETCH_SYMREFS:
746 		if (datalen < sizeof(*isymrefs)) {
747 			err = got_error(GOT_ERR_PRIVSEP_LEN);
748 			break;
749 		}
750 		if (isymrefs != NULL) {
751 			err = got_error(GOT_ERR_PRIVSEP_MSG);
752 			break;
753 		}
754 		isymrefs = (struct got_imsg_fetch_symrefs *)imsg.data;
755 		off = sizeof(*isymrefs);
756 		remain = datalen - off;
757 		for (n = 0; n < isymrefs->nsymrefs; n++) {
758 			struct got_imsg_fetch_symref *s;
759 			char *name, *target;
760 			if (remain < sizeof(struct got_imsg_fetch_symref)) {
761 				err = got_error(GOT_ERR_PRIVSEP_LEN);
762 				goto done;
763 			}
764 			s = (struct got_imsg_fetch_symref *)(imsg.data + off);
765 			off += sizeof(*s);
766 			remain -= sizeof(*s);
767 			if (remain < s->name_len) {
768 				err = got_error(GOT_ERR_PRIVSEP_LEN);
769 				goto done;
770 			}
771 			name = strndup(imsg.data + off, s->name_len);
772 			if (name == NULL) {
773 				err = got_error_from_errno("strndup");
774 				goto done;
775 			}
776 			off += s->name_len;
777 			remain -= s->name_len;
778 			if (remain < s->target_len) {
779 				err = got_error(GOT_ERR_PRIVSEP_LEN);
780 				free(name);
781 				goto done;
782 			}
783 			target = strndup(imsg.data + off, s->target_len);
784 			if (target == NULL) {
785 				err = got_error_from_errno("strndup");
786 				free(name);
787 				goto done;
788 			}
789 			off += s->target_len;
790 			remain -= s->target_len;
791 			err = got_pathlist_append(symrefs, name, target);
792 			if (err) {
793 				free(name);
794 				free(target);
795 				goto done;
796 			}
797 		}
798 		break;
799 	case GOT_IMSG_FETCH_REF:
800 		if (datalen <= SHA1_DIGEST_LENGTH) {
801 			err = got_error(GOT_ERR_PRIVSEP_MSG);
802 			break;
803 		}
804 		*id = malloc(sizeof(**id));
805 		if (*id == NULL) {
806 			err = got_error_from_errno("malloc");
807 			break;
808 		}
809 		memcpy((*id)->sha1, imsg.data, SHA1_DIGEST_LENGTH);
810 		*refname = strndup(imsg.data + SHA1_DIGEST_LENGTH,
811 		    datalen - SHA1_DIGEST_LENGTH);
812 		if (*refname == NULL) {
813 			err = got_error_from_errno("strndup");
814 			break;
815 		}
816 		break;
817 	case GOT_IMSG_FETCH_SERVER_PROGRESS:
818 		if (datalen == 0) {
819 			err = got_error(GOT_ERR_PRIVSEP_LEN);
820 			break;
821 		}
822 		*server_progress = strndup(imsg.data, datalen);
823 		if (*server_progress == NULL) {
824 			err = got_error_from_errno("strndup");
825 			break;
826 		}
827 		for (i = 0; i < datalen; i++) {
828 			if (!isprint((unsigned char)(*server_progress)[i]) &&
829 			    !isspace((unsigned char)(*server_progress)[i])) {
830 				err = got_error(GOT_ERR_PRIVSEP_MSG);
831 				free(*server_progress);
832 				*server_progress = NULL;
833 				goto done;
834 			}
835 		}
836 		break;
837 	case GOT_IMSG_FETCH_DOWNLOAD_PROGRESS:
838 		if (datalen < sizeof(*packfile_size)) {
839 			err = got_error(GOT_ERR_PRIVSEP_MSG);
840 			break;
841 		}
842 		memcpy(packfile_size, imsg.data, sizeof(*packfile_size));
843 		break;
844 	case GOT_IMSG_FETCH_DONE:
845 		if (datalen != SHA1_DIGEST_LENGTH) {
846 			err = got_error(GOT_ERR_PRIVSEP_MSG);
847 			break;
848 		}
849 		memcpy(pack_sha1, imsg.data, SHA1_DIGEST_LENGTH);
850 		*done = 1;
851 		break;
852 	default:
853 		err = got_error(GOT_ERR_PRIVSEP_MSG);
854 		break;
855 	}
856 done:
857 	if (err) {
858 		free(*id);
859 		*id = NULL;
860 		free(*refname);
861 		*refname = NULL;
862 	}
863 	imsg_free(&imsg);
864 	return err;
865 }
866 
867 static const struct got_error *
868 send_send_ref(const char *name, size_t name_len, struct got_object_id *id,
869     int delete, struct imsgbuf *ibuf)
870 {
871 	const struct got_error *err = NULL;
872 	size_t len;
873 	struct ibuf *wbuf;
874 
875 	len = sizeof(struct got_imsg_send_ref) + name_len;
876 	wbuf = imsg_create(ibuf, GOT_IMSG_SEND_REF, 0, 0, len);
877 	if (wbuf == NULL)
878 		return got_error_from_errno("imsg_create SEND_REF");
879 
880 	/* Keep in sync with struct got_imsg_send_ref! */
881 	if (imsg_add(wbuf, id->sha1, sizeof(id->sha1)) == -1) {
882 		err = got_error_from_errno("imsg_add SEND_REF");
883 		ibuf_free(wbuf);
884 		return err;
885 	}
886 	if (imsg_add(wbuf, &delete, sizeof(delete)) == -1) {
887 		err = got_error_from_errno("imsg_add SEND_REF");
888 		ibuf_free(wbuf);
889 		return err;
890 	}
891 	if (imsg_add(wbuf, &name_len, sizeof(name_len)) == -1) {
892 		err = got_error_from_errno("imsg_add SEND_REF");
893 		ibuf_free(wbuf);
894 		return err;
895 	}
896 	if (imsg_add(wbuf, name, name_len) == -1) {
897 		err = got_error_from_errno("imsg_add SEND_REF");
898 		ibuf_free(wbuf);
899 		return err;
900 	}
901 
902 	wbuf->fd = -1;
903 	imsg_close(ibuf, wbuf);
904 	return flush_imsg(ibuf);
905 }
906 
907 const struct got_error *
908 got_privsep_send_send_req(struct imsgbuf *ibuf, int fd,
909     struct got_pathlist_head *have_refs,
910     struct got_pathlist_head *delete_refs,
911     int verbosity)
912 {
913 	const struct got_error *err = NULL;
914 	struct got_pathlist_entry *pe;
915 	struct got_imsg_send_request sendreq;
916 	struct got_object_id zero_id;
917 
918 	memset(&zero_id, 0, sizeof(zero_id));
919 	memset(&sendreq, 0, sizeof(sendreq));
920 	sendreq.verbosity = verbosity;
921 	TAILQ_FOREACH(pe, have_refs, entry)
922 		sendreq.nrefs++;
923 	TAILQ_FOREACH(pe, delete_refs, entry)
924 		sendreq.nrefs++;
925 	if (imsg_compose(ibuf, GOT_IMSG_SEND_REQUEST, 0, 0, fd,
926 	    &sendreq, sizeof(sendreq)) == -1) {
927 		err = got_error_from_errno(
928 		    "imsg_compose FETCH_SERVER_PROGRESS");
929 		goto done;
930 	}
931 
932 	err = flush_imsg(ibuf);
933 	if (err)
934 		goto done;
935 	fd = -1;
936 
937 	TAILQ_FOREACH(pe, have_refs, entry) {
938 		const char *name = pe->path;
939 		size_t name_len = pe->path_len;
940 		struct got_object_id *id = pe->data;
941 		err = send_send_ref(name, name_len, id, 0, ibuf);
942 		if (err)
943 			goto done;
944 	}
945 
946 	TAILQ_FOREACH(pe, delete_refs, entry) {
947 		const char *name = pe->path;
948 		size_t name_len = pe->path_len;
949 		err = send_send_ref(name, name_len, &zero_id, 1, ibuf);
950 		if (err)
951 			goto done;
952 	}
953 done:
954 	if (fd != -1 && close(fd) == -1 && err == NULL)
955 		err = got_error_from_errno("close");
956 	return err;
957 
958 }
959 
960 const struct got_error *
961 got_privsep_recv_send_remote_refs(struct got_pathlist_head *remote_refs,
962     struct imsgbuf *ibuf)
963 {
964 	const struct got_error *err = NULL;
965 	struct imsg imsg;
966 	size_t datalen;
967 	int done = 0;
968 	struct got_imsg_send_remote_ref iremote_ref;
969 	struct got_object_id *id = NULL;
970 	char *refname = NULL;
971 	struct got_pathlist_entry *new;
972 
973 	while (!done) {
974 		err = got_privsep_recv_imsg(&imsg, ibuf, 0);
975 		if (err)
976 			return err;
977 		datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
978 		switch (imsg.hdr.type) {
979 		case GOT_IMSG_ERROR:
980 			if (datalen < sizeof(struct got_imsg_error)) {
981 				err = got_error(GOT_ERR_PRIVSEP_LEN);
982 				goto done;
983 			}
984 			err = recv_imsg_error(&imsg, datalen);
985 			goto done;
986 		case GOT_IMSG_SEND_REMOTE_REF:
987 			if (datalen < sizeof(iremote_ref)) {
988 				err = got_error(GOT_ERR_PRIVSEP_MSG);
989 				goto done;
990 			}
991 			memcpy(&iremote_ref, imsg.data, sizeof(iremote_ref));
992 			if (datalen != sizeof(iremote_ref) +
993 			    iremote_ref.name_len) {
994 				err = got_error(GOT_ERR_PRIVSEP_MSG);
995 				goto done;
996 			}
997 			id = malloc(sizeof(*id));
998 			if (id == NULL) {
999 				err = got_error_from_errno("malloc");
1000 				goto done;
1001 			}
1002 			memcpy(id->sha1, iremote_ref.id, SHA1_DIGEST_LENGTH);
1003 			refname = strndup(imsg.data + sizeof(iremote_ref),
1004 			    datalen - sizeof(iremote_ref));
1005 			if (refname == NULL) {
1006 				err = got_error_from_errno("strndup");
1007 				goto done;
1008 			}
1009 			err = got_pathlist_insert(&new, remote_refs,
1010 			    refname, id);
1011 			if (err)
1012 				goto done;
1013 			if (new == NULL) { /* duplicate which wasn't inserted */
1014 				free(id);
1015 				free(refname);
1016 			}
1017 			id = NULL;
1018 			refname = NULL;
1019 			break;
1020 		case GOT_IMSG_SEND_PACK_REQUEST:
1021 			if (datalen != 0) {
1022 				err = got_error(GOT_ERR_PRIVSEP_MSG);
1023 				goto done;
1024 			}
1025 			/* got-send-pack is now waiting for a pack file. */
1026 			done = 1;
1027 			break;
1028 		default:
1029 			err = got_error(GOT_ERR_PRIVSEP_MSG);
1030 			break;
1031 		}
1032 	}
1033 done:
1034 	free(id);
1035 	free(refname);
1036 	imsg_free(&imsg);
1037 	return err;
1038 }
1039 
1040 const struct got_error *
1041 got_privsep_send_packfd(struct imsgbuf *ibuf, int fd)
1042 {
1043 	return send_fd(ibuf, GOT_IMSG_SEND_PACKFD, fd);
1044 }
1045 
1046 const struct got_error *
1047 got_privsep_recv_send_progress(int *done, off_t *bytes_sent,
1048     int *success, char **refname, struct imsgbuf *ibuf)
1049 {
1050 	const struct got_error *err = NULL;
1051 	struct imsg imsg;
1052 	size_t datalen;
1053 	struct got_imsg_send_ref_status iref_status;
1054 
1055 	/* Do not reset the current value of 'bytes_sent', it accumulates. */
1056 	*done = 0;
1057 	*success = 0;
1058 	*refname = NULL;
1059 
1060 	err = got_privsep_recv_imsg(&imsg, ibuf, 0);
1061 	if (err)
1062 		return err;
1063 
1064 	datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
1065 	switch (imsg.hdr.type) {
1066 	case GOT_IMSG_ERROR:
1067 		if (datalen < sizeof(struct got_imsg_error)) {
1068 			err = got_error(GOT_ERR_PRIVSEP_LEN);
1069 			break;
1070 		}
1071 		err = recv_imsg_error(&imsg, datalen);
1072 		break;
1073 	case GOT_IMSG_SEND_UPLOAD_PROGRESS:
1074 		if (datalen < sizeof(*bytes_sent)) {
1075 			err = got_error(GOT_ERR_PRIVSEP_MSG);
1076 			break;
1077 		}
1078 		memcpy(bytes_sent, imsg.data, sizeof(*bytes_sent));
1079 		break;
1080 	case GOT_IMSG_SEND_REF_STATUS:
1081 		if (datalen < sizeof(iref_status)) {
1082 			err = got_error(GOT_ERR_PRIVSEP_MSG);
1083 			break;
1084 		}
1085 		memcpy(&iref_status, imsg.data, sizeof(iref_status));
1086 		if (datalen != sizeof(iref_status) + iref_status.name_len) {
1087 			err = got_error(GOT_ERR_PRIVSEP_MSG);
1088 			break;
1089 		}
1090 		*success = iref_status.success;
1091 		*refname = strndup(imsg.data + sizeof(iref_status),
1092 		    iref_status.name_len);
1093 		break;
1094 	case GOT_IMSG_SEND_DONE:
1095 		if (datalen != 0) {
1096 			err = got_error(GOT_ERR_PRIVSEP_MSG);
1097 			break;
1098 		}
1099 		*done = 1;
1100 		break;
1101 	default:
1102 		err = got_error(GOT_ERR_PRIVSEP_MSG);
1103 		break;
1104 	}
1105 
1106 	imsg_free(&imsg);
1107 	return err;
1108 }
1109 
1110 const struct got_error *
1111 got_privsep_send_index_pack_req(struct imsgbuf *ibuf, uint8_t *pack_sha1,
1112     int fd)
1113 {
1114 	const struct got_error *err = NULL;
1115 
1116 	/* Keep in sync with struct got_imsg_index_pack_request */
1117 	if (imsg_compose(ibuf, GOT_IMSG_IDXPACK_REQUEST, 0, 0, fd,
1118 	    pack_sha1, SHA1_DIGEST_LENGTH) == -1) {
1119 		err = got_error_from_errno("imsg_compose INDEX_REQUEST");
1120 		close(fd);
1121 		return err;
1122 	}
1123 	return flush_imsg(ibuf);
1124 }
1125 
1126 const struct got_error *
1127 got_privsep_send_index_pack_outfd(struct imsgbuf *ibuf, int fd)
1128 {
1129 	return send_fd(ibuf, GOT_IMSG_IDXPACK_OUTFD, fd);
1130 }
1131 
1132 const struct got_error *
1133 got_privsep_recv_index_progress(int *done, int *nobj_total,
1134     int *nobj_indexed, int *nobj_loose, int *nobj_resolved,
1135     struct imsgbuf *ibuf)
1136 {
1137 	const struct got_error *err = NULL;
1138 	struct imsg imsg;
1139 	struct got_imsg_index_pack_progress *iprogress;
1140 	size_t datalen;
1141 
1142 	*done = 0;
1143 	*nobj_total = 0;
1144 	*nobj_indexed = 0;
1145 	*nobj_resolved = 0;
1146 
1147 	err = got_privsep_recv_imsg(&imsg, ibuf, 0);
1148 	if (err)
1149 		return err;
1150 
1151 	datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
1152 	switch (imsg.hdr.type) {
1153 	case GOT_IMSG_ERROR:
1154 		if (datalen < sizeof(struct got_imsg_error)) {
1155 			err = got_error(GOT_ERR_PRIVSEP_LEN);
1156 			break;
1157 		}
1158 		err = recv_imsg_error(&imsg, datalen);
1159 		break;
1160 	case GOT_IMSG_IDXPACK_PROGRESS:
1161 		if (datalen < sizeof(*iprogress)) {
1162 			err = got_error(GOT_ERR_PRIVSEP_LEN);
1163 			break;
1164 		}
1165 		iprogress = (struct got_imsg_index_pack_progress *)imsg.data;
1166 		*nobj_total = iprogress->nobj_total;
1167 		*nobj_indexed = iprogress->nobj_indexed;
1168 		*nobj_loose = iprogress->nobj_loose;
1169 		*nobj_resolved = iprogress->nobj_resolved;
1170 		break;
1171 	case GOT_IMSG_IDXPACK_DONE:
1172 		if (datalen != 0) {
1173 			err = got_error(GOT_ERR_PRIVSEP_LEN);
1174 			break;
1175 		}
1176 		*done = 1;
1177 		break;
1178 	default:
1179 		err = got_error(GOT_ERR_PRIVSEP_MSG);
1180 		break;
1181 	}
1182 
1183 	imsg_free(&imsg);
1184 	return err;
1185 }
1186 
1187 const struct got_error *
1188 got_privsep_get_imsg_obj(struct got_object **obj, struct imsg *imsg,
1189     struct imsgbuf *ibuf)
1190 {
1191 	struct got_imsg_object *iobj;
1192 	size_t datalen = imsg->hdr.len - IMSG_HEADER_SIZE;
1193 
1194 	if (datalen != sizeof(*iobj))
1195 		return got_error(GOT_ERR_PRIVSEP_LEN);
1196 	iobj = imsg->data;
1197 
1198 	*obj = calloc(1, sizeof(**obj));
1199 	if (*obj == NULL)
1200 		return got_error_from_errno("calloc");
1201 
1202 	memcpy((*obj)->id.sha1, iobj->id, SHA1_DIGEST_LENGTH);
1203 	(*obj)->type = iobj->type;
1204 	(*obj)->flags = iobj->flags;
1205 	(*obj)->hdrlen = iobj->hdrlen;
1206 	(*obj)->size = iobj->size;
1207 	/* path_packfile is handled by caller */
1208 	if (iobj->flags & GOT_OBJ_FLAG_PACKED) {
1209 		(*obj)->pack_offset = iobj->pack_offset;
1210 		(*obj)->pack_idx = iobj->pack_idx;
1211 	}
1212 	STAILQ_INIT(&(*obj)->deltas.entries);
1213 	return NULL;
1214 }
1215 
1216 const struct got_error *
1217 got_privsep_recv_obj(struct got_object **obj, struct imsgbuf *ibuf)
1218 {
1219 	const struct got_error *err = NULL;
1220 	struct imsg imsg;
1221 	const size_t min_datalen =
1222 	    MIN(sizeof(struct got_imsg_error), sizeof(struct got_imsg_object));
1223 
1224 	*obj = NULL;
1225 
1226 	err = got_privsep_recv_imsg(&imsg, ibuf, min_datalen);
1227 	if (err)
1228 		return err;
1229 
1230 	switch (imsg.hdr.type) {
1231 	case GOT_IMSG_OBJECT:
1232 		err = got_privsep_get_imsg_obj(obj, &imsg, ibuf);
1233 		break;
1234 	default:
1235 		err = got_error(GOT_ERR_PRIVSEP_MSG);
1236 		break;
1237 	}
1238 
1239 	imsg_free(&imsg);
1240 
1241 	return err;
1242 }
1243 
1244 static const struct got_error *
1245 send_commit_logmsg(struct imsgbuf *ibuf, struct got_commit_object *commit,
1246     size_t logmsg_len)
1247 {
1248 	const struct got_error *err = NULL;
1249 	size_t offset, remain;
1250 
1251 	offset = 0;
1252 	remain = logmsg_len;
1253 	while (remain > 0) {
1254 		size_t n = MIN(MAX_IMSGSIZE - IMSG_HEADER_SIZE, remain);
1255 
1256 		if (imsg_compose(ibuf, GOT_IMSG_COMMIT_LOGMSG, 0, 0, -1,
1257 		    commit->logmsg + offset, n) == -1) {
1258 			err = got_error_from_errno("imsg_compose "
1259 			    "COMMIT_LOGMSG");
1260 			break;
1261 		}
1262 
1263 		err = flush_imsg(ibuf);
1264 		if (err)
1265 			break;
1266 
1267 		offset += n;
1268 		remain -= n;
1269 	}
1270 
1271 	return err;
1272 }
1273 
1274 const struct got_error *
1275 got_privsep_send_commit(struct imsgbuf *ibuf, struct got_commit_object *commit)
1276 {
1277 	const struct got_error *err = NULL;
1278 	struct got_imsg_commit_object *icommit;
1279 	uint8_t *buf;
1280 	size_t len, total;
1281 	struct got_object_qid *qid;
1282 	size_t author_len = strlen(commit->author);
1283 	size_t committer_len = strlen(commit->committer);
1284 	size_t logmsg_len = strlen(commit->logmsg);
1285 
1286 	total = sizeof(*icommit) + author_len + committer_len +
1287 	    commit->nparents * SHA1_DIGEST_LENGTH;
1288 
1289 	buf = malloc(total);
1290 	if (buf == NULL)
1291 		return got_error_from_errno("malloc");
1292 
1293 	icommit = (struct got_imsg_commit_object *)buf;
1294 	memcpy(icommit->tree_id, commit->tree_id->sha1,
1295 	    sizeof(icommit->tree_id));
1296 	icommit->author_len = author_len;
1297 	icommit->author_time = commit->author_time;
1298 	icommit->author_gmtoff = commit->author_gmtoff;
1299 	icommit->committer_len = committer_len;
1300 	icommit->committer_time = commit->committer_time;
1301 	icommit->committer_gmtoff = commit->committer_gmtoff;
1302 	icommit->logmsg_len = logmsg_len;
1303 	icommit->nparents = commit->nparents;
1304 
1305 	len = sizeof(*icommit);
1306 	memcpy(buf + len, commit->author, author_len);
1307 	len += author_len;
1308 	memcpy(buf + len, commit->committer, committer_len);
1309 	len += committer_len;
1310 	STAILQ_FOREACH(qid, &commit->parent_ids, entry) {
1311 		memcpy(buf + len, &qid->id, SHA1_DIGEST_LENGTH);
1312 		len += SHA1_DIGEST_LENGTH;
1313 	}
1314 
1315 	if (imsg_compose(ibuf, GOT_IMSG_COMMIT, 0, 0, -1, buf, len) == -1) {
1316 		err = got_error_from_errno("imsg_compose COMMIT");
1317 		goto done;
1318 	}
1319 
1320 	if (logmsg_len == 0 ||
1321 	    logmsg_len + len > MAX_IMSGSIZE - IMSG_HEADER_SIZE) {
1322 		err = flush_imsg(ibuf);
1323 		if (err)
1324 			goto done;
1325 	}
1326 	err = send_commit_logmsg(ibuf, commit, logmsg_len);
1327 done:
1328 	free(buf);
1329 	return err;
1330 }
1331 
1332 static const struct got_error *
1333 get_commit_from_imsg(struct got_commit_object **commit,
1334     struct imsg *imsg, size_t datalen, struct imsgbuf *ibuf)
1335 {
1336 	const struct got_error *err = NULL;
1337 	struct got_imsg_commit_object *icommit;
1338 	size_t len = 0;
1339 	int i;
1340 
1341 	if (datalen < sizeof(*icommit))
1342 		return got_error(GOT_ERR_PRIVSEP_LEN);
1343 
1344 	icommit = imsg->data;
1345 	if (datalen != sizeof(*icommit) + icommit->author_len +
1346 	    icommit->committer_len +
1347 	    icommit->nparents * SHA1_DIGEST_LENGTH)
1348 		return got_error(GOT_ERR_PRIVSEP_LEN);
1349 
1350 	if (icommit->nparents < 0)
1351 		return got_error(GOT_ERR_PRIVSEP_LEN);
1352 
1353 	len += sizeof(*icommit);
1354 
1355 	*commit = got_object_commit_alloc_partial();
1356 	if (*commit == NULL)
1357 		return got_error_from_errno(
1358 		    "got_object_commit_alloc_partial");
1359 
1360 	memcpy((*commit)->tree_id->sha1, icommit->tree_id,
1361 	    SHA1_DIGEST_LENGTH);
1362 	(*commit)->author_time = icommit->author_time;
1363 	(*commit)->author_gmtoff = icommit->author_gmtoff;
1364 	(*commit)->committer_time = icommit->committer_time;
1365 	(*commit)->committer_gmtoff = icommit->committer_gmtoff;
1366 
1367 	if (icommit->author_len == 0) {
1368 		(*commit)->author = strdup("");
1369 		if ((*commit)->author == NULL) {
1370 			err = got_error_from_errno("strdup");
1371 			goto done;
1372 		}
1373 	} else {
1374 		(*commit)->author = malloc(icommit->author_len + 1);
1375 		if ((*commit)->author == NULL) {
1376 			err = got_error_from_errno("malloc");
1377 			goto done;
1378 		}
1379 		memcpy((*commit)->author, imsg->data + len,
1380 		    icommit->author_len);
1381 		(*commit)->author[icommit->author_len] = '\0';
1382 	}
1383 	len += icommit->author_len;
1384 
1385 	if (icommit->committer_len == 0) {
1386 		(*commit)->committer = strdup("");
1387 		if ((*commit)->committer == NULL) {
1388 			err = got_error_from_errno("strdup");
1389 			goto done;
1390 		}
1391 	} else {
1392 		(*commit)->committer =
1393 		    malloc(icommit->committer_len + 1);
1394 		if ((*commit)->committer == NULL) {
1395 			err = got_error_from_errno("malloc");
1396 			goto done;
1397 		}
1398 		memcpy((*commit)->committer, imsg->data + len,
1399 		    icommit->committer_len);
1400 		(*commit)->committer[icommit->committer_len] = '\0';
1401 	}
1402 	len += icommit->committer_len;
1403 
1404 	if (icommit->logmsg_len == 0) {
1405 		(*commit)->logmsg = strdup("");
1406 		if ((*commit)->logmsg == NULL) {
1407 			err = got_error_from_errno("strdup");
1408 			goto done;
1409 		}
1410 	} else {
1411 		size_t offset = 0, remain = icommit->logmsg_len;
1412 
1413 		(*commit)->logmsg = malloc(icommit->logmsg_len + 1);
1414 		if ((*commit)->logmsg == NULL) {
1415 			err = got_error_from_errno("malloc");
1416 			goto done;
1417 		}
1418 		while (remain > 0) {
1419 			struct imsg imsg_log;
1420 			size_t n = MIN(MAX_IMSGSIZE - IMSG_HEADER_SIZE,
1421 			    remain);
1422 
1423 			err = got_privsep_recv_imsg(&imsg_log, ibuf, n);
1424 			if (err)
1425 				goto done;
1426 
1427 			if (imsg_log.hdr.type != GOT_IMSG_COMMIT_LOGMSG) {
1428 				err = got_error(GOT_ERR_PRIVSEP_MSG);
1429 				goto done;
1430 			}
1431 
1432 			memcpy((*commit)->logmsg + offset,
1433 			    imsg_log.data, n);
1434 			imsg_free(&imsg_log);
1435 			offset += n;
1436 			remain -= n;
1437 		}
1438 		(*commit)->logmsg[icommit->logmsg_len] = '\0';
1439 	}
1440 
1441 	for (i = 0; i < icommit->nparents; i++) {
1442 		struct got_object_qid *qid;
1443 
1444 		err = got_object_qid_alloc_partial(&qid);
1445 		if (err)
1446 			break;
1447 		memcpy(&qid->id, imsg->data + len +
1448 		    i * SHA1_DIGEST_LENGTH, sizeof(qid->id));
1449 		STAILQ_INSERT_TAIL(&(*commit)->parent_ids, qid, entry);
1450 		(*commit)->nparents++;
1451 	}
1452 done:
1453 	if (err) {
1454 		got_object_commit_close(*commit);
1455 		*commit = NULL;
1456 	}
1457 	return err;
1458 }
1459 
1460 const struct got_error *
1461 got_privsep_recv_commit(struct got_commit_object **commit, struct imsgbuf *ibuf)
1462 {
1463 	const struct got_error *err = NULL;
1464 	struct imsg imsg;
1465 	size_t datalen;
1466 	const size_t min_datalen =
1467 	    MIN(sizeof(struct got_imsg_error),
1468 	    sizeof(struct got_imsg_commit_object));
1469 
1470 	*commit = NULL;
1471 
1472 	err = got_privsep_recv_imsg(&imsg, ibuf, min_datalen);
1473 	if (err)
1474 		return err;
1475 
1476 	datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
1477 
1478 	switch (imsg.hdr.type) {
1479 	case GOT_IMSG_COMMIT:
1480 		err = get_commit_from_imsg(commit, &imsg, datalen, ibuf);
1481 		break;
1482 	default:
1483 		err = got_error(GOT_ERR_PRIVSEP_MSG);
1484 		break;
1485 	}
1486 
1487 	imsg_free(&imsg);
1488 
1489 	return err;
1490 }
1491 
1492 const struct got_error *
1493 got_privsep_send_tree(struct imsgbuf *ibuf, struct got_pathlist_head *entries,
1494     int nentries)
1495 {
1496 	const struct got_error *err = NULL;
1497 	struct got_imsg_tree_object itree;
1498 	struct got_pathlist_entry *pe;
1499 	size_t totlen;
1500 	int nimsg; /* number of imsg queued in ibuf */
1501 
1502 	itree.nentries = nentries;
1503 	if (imsg_compose(ibuf, GOT_IMSG_TREE, 0, 0, -1, &itree, sizeof(itree))
1504 	    == -1)
1505 		return got_error_from_errno("imsg_compose TREE");
1506 
1507 	totlen = sizeof(itree);
1508 	nimsg = 1;
1509 	TAILQ_FOREACH(pe, entries, entry) {
1510 		const char *name = pe->path;
1511 		struct got_parsed_tree_entry *pte = pe->data;
1512 		struct ibuf *wbuf;
1513 		size_t namelen = strlen(name);
1514 		size_t len = sizeof(struct got_imsg_tree_entry) + namelen;
1515 
1516 		if (len > MAX_IMSGSIZE)
1517 			return got_error(GOT_ERR_NO_SPACE);
1518 
1519 		nimsg++;
1520 		if (totlen + len >= MAX_IMSGSIZE - (IMSG_HEADER_SIZE * nimsg)) {
1521 			err = flush_imsg(ibuf);
1522 			if (err)
1523 				return err;
1524 			nimsg = 0;
1525 		}
1526 
1527 		wbuf = imsg_create(ibuf, GOT_IMSG_TREE_ENTRY, 0, 0, len);
1528 		if (wbuf == NULL)
1529 			return got_error_from_errno("imsg_create TREE_ENTRY");
1530 
1531 		/* Keep in sync with struct got_imsg_tree_object definition! */
1532 		if (imsg_add(wbuf, pte->id, SHA1_DIGEST_LENGTH) == -1) {
1533 			err = got_error_from_errno("imsg_add TREE_ENTRY");
1534 			ibuf_free(wbuf);
1535 			return err;
1536 		}
1537 		if (imsg_add(wbuf, &pte->mode, sizeof(pte->mode)) == -1) {
1538 			err = got_error_from_errno("imsg_add TREE_ENTRY");
1539 			ibuf_free(wbuf);
1540 			return err;
1541 		}
1542 
1543 		if (imsg_add(wbuf, name, namelen) == -1) {
1544 			err = got_error_from_errno("imsg_add TREE_ENTRY");
1545 			ibuf_free(wbuf);
1546 			return err;
1547 		}
1548 
1549 		wbuf->fd = -1;
1550 		imsg_close(ibuf, wbuf);
1551 
1552 		totlen += len;
1553 	}
1554 
1555 	return flush_imsg(ibuf);
1556 }
1557 
1558 const struct got_error *
1559 got_privsep_recv_tree(struct got_tree_object **tree, struct imsgbuf *ibuf)
1560 {
1561 	const struct got_error *err = NULL;
1562 	const size_t min_datalen =
1563 	    MIN(sizeof(struct got_imsg_error),
1564 	    sizeof(struct got_imsg_tree_object));
1565 	struct got_imsg_tree_object *itree;
1566 	int nentries = 0;
1567 
1568 	*tree = NULL;
1569 get_more:
1570 	err = read_imsg(ibuf);
1571 	if (err)
1572 		goto done;
1573 
1574 	for (;;) {
1575 		struct imsg imsg;
1576 		size_t n;
1577 		size_t datalen;
1578 		struct got_imsg_tree_entry *ite;
1579 		struct got_tree_entry *te = NULL;
1580 
1581 		n = imsg_get(ibuf, &imsg);
1582 		if (n == 0) {
1583 			if (*tree && (*tree)->nentries != nentries)
1584 				goto get_more;
1585 			break;
1586 		}
1587 
1588 		if (imsg.hdr.len < IMSG_HEADER_SIZE + min_datalen) {
1589 			imsg_free(&imsg);
1590 			err = got_error(GOT_ERR_PRIVSEP_LEN);
1591 			break;
1592 		}
1593 
1594 		datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
1595 
1596 		switch (imsg.hdr.type) {
1597 		case GOT_IMSG_ERROR:
1598 			err = recv_imsg_error(&imsg, datalen);
1599 			break;
1600 		case GOT_IMSG_TREE:
1601 			/* This message should only appear once. */
1602 			if (*tree != NULL) {
1603 				err = got_error(GOT_ERR_PRIVSEP_MSG);
1604 				break;
1605 			}
1606 			if (datalen != sizeof(*itree)) {
1607 				err = got_error(GOT_ERR_PRIVSEP_LEN);
1608 				break;
1609 			}
1610 			itree = imsg.data;
1611 			*tree = malloc(sizeof(**tree));
1612 			if (*tree == NULL) {
1613 				err = got_error_from_errno("malloc");
1614 				break;
1615 			}
1616 			(*tree)->entries = calloc(itree->nentries,
1617 			    sizeof(struct got_tree_entry));
1618 			if ((*tree)->entries == NULL) {
1619 				err = got_error_from_errno("malloc");
1620 				break;
1621 			}
1622 			(*tree)->nentries = itree->nentries;
1623 			(*tree)->refcnt = 0;
1624 			break;
1625 		case GOT_IMSG_TREE_ENTRY:
1626 			/* This message should be preceeded by GOT_IMSG_TREE. */
1627 			if (*tree == NULL) {
1628 				err = got_error(GOT_ERR_PRIVSEP_MSG);
1629 				break;
1630 			}
1631 			if (datalen < sizeof(*ite) || datalen > MAX_IMSGSIZE) {
1632 				err = got_error(GOT_ERR_PRIVSEP_LEN);
1633 				break;
1634 			}
1635 
1636 			/* Remaining data contains the entry's name. */
1637 			datalen -= sizeof(*ite);
1638 			if (datalen == 0 || datalen > MAX_IMSGSIZE) {
1639 				err = got_error(GOT_ERR_PRIVSEP_LEN);
1640 				break;
1641 			}
1642 			ite = imsg.data;
1643 
1644 			if (datalen + 1 > sizeof(te->name)) {
1645 				err = got_error(GOT_ERR_NO_SPACE);
1646 				break;
1647 			}
1648 			te = &(*tree)->entries[nentries];
1649 			memcpy(te->name, imsg.data + sizeof(*ite), datalen);
1650 			te->name[datalen] = '\0';
1651 
1652 			memcpy(te->id.sha1, ite->id, SHA1_DIGEST_LENGTH);
1653 			te->mode = ite->mode;
1654 			te->idx = nentries;
1655 			nentries++;
1656 			break;
1657 		default:
1658 			err = got_error(GOT_ERR_PRIVSEP_MSG);
1659 			break;
1660 		}
1661 
1662 		imsg_free(&imsg);
1663 		if (err)
1664 			break;
1665 	}
1666 done:
1667 	if (*tree && (*tree)->nentries != nentries) {
1668 		if (err == NULL)
1669 			err = got_error(GOT_ERR_PRIVSEP_LEN);
1670 		got_object_tree_close(*tree);
1671 		*tree = NULL;
1672 	}
1673 
1674 	return err;
1675 }
1676 
1677 const struct got_error *
1678 got_privsep_send_blob(struct imsgbuf *ibuf, size_t size, size_t hdrlen,
1679     const uint8_t *data)
1680 {
1681 	struct got_imsg_blob iblob;
1682 
1683 	iblob.size = size;
1684 	iblob.hdrlen = hdrlen;
1685 
1686 	if (data) {
1687 		uint8_t *buf;
1688 
1689 		if (size > GOT_PRIVSEP_INLINE_BLOB_DATA_MAX)
1690 			return got_error(GOT_ERR_NO_SPACE);
1691 
1692 		buf = malloc(sizeof(iblob) + size);
1693 		if (buf == NULL)
1694 			return got_error_from_errno("malloc");
1695 
1696 		memcpy(buf, &iblob, sizeof(iblob));
1697 		memcpy(buf + sizeof(iblob), data, size);
1698 		if (imsg_compose(ibuf, GOT_IMSG_BLOB, 0, 0, -1, buf,
1699 		    sizeof(iblob) + size) == -1) {
1700 			free(buf);
1701 			return got_error_from_errno("imsg_compose BLOB");
1702 		}
1703 		free(buf);
1704 	} else {
1705 		/* Data has already been written to file descriptor. */
1706 		if (imsg_compose(ibuf, GOT_IMSG_BLOB, 0, 0, -1, &iblob,
1707 		    sizeof(iblob)) == -1)
1708 			return got_error_from_errno("imsg_compose BLOB");
1709 	}
1710 
1711 
1712 	return flush_imsg(ibuf);
1713 }
1714 
1715 const struct got_error *
1716 got_privsep_recv_blob(uint8_t **outbuf, size_t *size, size_t *hdrlen,
1717     struct imsgbuf *ibuf)
1718 {
1719 	const struct got_error *err = NULL;
1720 	struct imsg imsg;
1721 	struct got_imsg_blob *iblob;
1722 	size_t datalen;
1723 
1724 	*outbuf = NULL;
1725 
1726 	err = got_privsep_recv_imsg(&imsg, ibuf, 0);
1727 	if (err)
1728 		return err;
1729 
1730 	datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
1731 
1732 	switch (imsg.hdr.type) {
1733 	case GOT_IMSG_BLOB:
1734 		if (datalen < sizeof(*iblob)) {
1735 			err = got_error(GOT_ERR_PRIVSEP_LEN);
1736 			break;
1737 		}
1738 		iblob = imsg.data;
1739 		*size = iblob->size;
1740 		*hdrlen = iblob->hdrlen;
1741 
1742 		if (datalen == sizeof(*iblob)) {
1743 			/* Data has been written to file descriptor. */
1744 			break;
1745 		}
1746 
1747 		if (*size > GOT_PRIVSEP_INLINE_BLOB_DATA_MAX) {
1748 			err = got_error(GOT_ERR_PRIVSEP_LEN);
1749 			break;
1750 		}
1751 
1752 		*outbuf = malloc(*size);
1753 		if (*outbuf == NULL) {
1754 			err = got_error_from_errno("malloc");
1755 			break;
1756 		}
1757 		memcpy(*outbuf, imsg.data + sizeof(*iblob), *size);
1758 		break;
1759 	default:
1760 		err = got_error(GOT_ERR_PRIVSEP_MSG);
1761 		break;
1762 	}
1763 
1764 	imsg_free(&imsg);
1765 
1766 	return err;
1767 }
1768 
1769 static const struct got_error *
1770 send_tagmsg(struct imsgbuf *ibuf, struct got_tag_object *tag, size_t tagmsg_len)
1771 {
1772 	const struct got_error *err = NULL;
1773 	size_t offset, remain;
1774 
1775 	offset = 0;
1776 	remain = tagmsg_len;
1777 	while (remain > 0) {
1778 		size_t n = MIN(MAX_IMSGSIZE - IMSG_HEADER_SIZE, remain);
1779 
1780 		if (imsg_compose(ibuf, GOT_IMSG_TAG_TAGMSG, 0, 0, -1,
1781 		    tag->tagmsg + offset, n) == -1) {
1782 			err = got_error_from_errno("imsg_compose TAG_TAGMSG");
1783 			break;
1784 		}
1785 
1786 		err = flush_imsg(ibuf);
1787 		if (err)
1788 			break;
1789 
1790 		offset += n;
1791 		remain -= n;
1792 	}
1793 
1794 	return err;
1795 }
1796 
1797 const struct got_error *
1798 got_privsep_send_tag(struct imsgbuf *ibuf, struct got_tag_object *tag)
1799 {
1800 	const struct got_error *err = NULL;
1801 	struct got_imsg_tag_object *itag;
1802 	uint8_t *buf;
1803 	size_t len, total;
1804 	size_t tag_len = strlen(tag->tag);
1805 	size_t tagger_len = strlen(tag->tagger);
1806 	size_t tagmsg_len = strlen(tag->tagmsg);
1807 
1808 	total = sizeof(*itag) + tag_len + tagger_len + tagmsg_len;
1809 
1810 	buf = malloc(total);
1811 	if (buf == NULL)
1812 		return got_error_from_errno("malloc");
1813 
1814 	itag = (struct got_imsg_tag_object *)buf;
1815 	memcpy(itag->id, tag->id.sha1, sizeof(itag->id));
1816 	itag->obj_type = tag->obj_type;
1817 	itag->tag_len = tag_len;
1818 	itag->tagger_len = tagger_len;
1819 	itag->tagger_time = tag->tagger_time;
1820 	itag->tagger_gmtoff = tag->tagger_gmtoff;
1821 	itag->tagmsg_len = tagmsg_len;
1822 
1823 	len = sizeof(*itag);
1824 	memcpy(buf + len, tag->tag, tag_len);
1825 	len += tag_len;
1826 	memcpy(buf + len, tag->tagger, tagger_len);
1827 	len += tagger_len;
1828 
1829 	if (imsg_compose(ibuf, GOT_IMSG_TAG, 0, 0, -1, buf, len) == -1) {
1830 		err = got_error_from_errno("imsg_compose TAG");
1831 		goto done;
1832 	}
1833 
1834 	if (tagmsg_len == 0 ||
1835 	    tagmsg_len + len > MAX_IMSGSIZE - IMSG_HEADER_SIZE) {
1836 		err = flush_imsg(ibuf);
1837 		if (err)
1838 			goto done;
1839 	}
1840 	err = send_tagmsg(ibuf, tag, tagmsg_len);
1841 done:
1842 	free(buf);
1843 	return err;
1844 }
1845 
1846 const struct got_error *
1847 got_privsep_recv_tag(struct got_tag_object **tag, struct imsgbuf *ibuf)
1848 {
1849 	const struct got_error *err = NULL;
1850 	struct imsg imsg;
1851 	struct got_imsg_tag_object *itag;
1852 	size_t len, datalen;
1853 	const size_t min_datalen =
1854 	    MIN(sizeof(struct got_imsg_error),
1855 	    sizeof(struct got_imsg_tag_object));
1856 
1857 	*tag = NULL;
1858 
1859 	err = got_privsep_recv_imsg(&imsg, ibuf, min_datalen);
1860 	if (err)
1861 		return err;
1862 
1863 	datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
1864 	len = 0;
1865 
1866 	switch (imsg.hdr.type) {
1867 	case GOT_IMSG_TAG:
1868 		if (datalen < sizeof(*itag)) {
1869 			err = got_error(GOT_ERR_PRIVSEP_LEN);
1870 			break;
1871 		}
1872 		itag = imsg.data;
1873 		if (datalen != sizeof(*itag) + itag->tag_len +
1874 		    itag->tagger_len) {
1875 			err = got_error(GOT_ERR_PRIVSEP_LEN);
1876 			break;
1877 		}
1878 		len += sizeof(*itag);
1879 
1880 		*tag = calloc(1, sizeof(**tag));
1881 		if (*tag == NULL) {
1882 			err = got_error_from_errno("calloc");
1883 			break;
1884 		}
1885 
1886 		memcpy((*tag)->id.sha1, itag->id, SHA1_DIGEST_LENGTH);
1887 
1888 		if (itag->tag_len == 0) {
1889 			(*tag)->tag = strdup("");
1890 			if ((*tag)->tag == NULL) {
1891 				err = got_error_from_errno("strdup");
1892 				break;
1893 			}
1894 		} else {
1895 			(*tag)->tag = malloc(itag->tag_len + 1);
1896 			if ((*tag)->tag == NULL) {
1897 				err = got_error_from_errno("malloc");
1898 				break;
1899 			}
1900 			memcpy((*tag)->tag, imsg.data + len,
1901 			    itag->tag_len);
1902 			(*tag)->tag[itag->tag_len] = '\0';
1903 		}
1904 		len += itag->tag_len;
1905 
1906 		(*tag)->obj_type = itag->obj_type;
1907 		(*tag)->tagger_time = itag->tagger_time;
1908 		(*tag)->tagger_gmtoff = itag->tagger_gmtoff;
1909 
1910 		if (itag->tagger_len == 0) {
1911 			(*tag)->tagger = strdup("");
1912 			if ((*tag)->tagger == NULL) {
1913 				err = got_error_from_errno("strdup");
1914 				break;
1915 			}
1916 		} else {
1917 			(*tag)->tagger = malloc(itag->tagger_len + 1);
1918 			if ((*tag)->tagger == NULL) {
1919 				err = got_error_from_errno("malloc");
1920 				break;
1921 			}
1922 			memcpy((*tag)->tagger, imsg.data + len,
1923 			    itag->tagger_len);
1924 			(*tag)->tagger[itag->tagger_len] = '\0';
1925 		}
1926 		len += itag->tagger_len;
1927 
1928 		if (itag->tagmsg_len == 0) {
1929 			(*tag)->tagmsg = strdup("");
1930 			if ((*tag)->tagmsg == NULL) {
1931 				err = got_error_from_errno("strdup");
1932 				break;
1933 			}
1934 		} else {
1935 			size_t offset = 0, remain = itag->tagmsg_len;
1936 
1937 			(*tag)->tagmsg = malloc(itag->tagmsg_len + 1);
1938 			if ((*tag)->tagmsg == NULL) {
1939 				err = got_error_from_errno("malloc");
1940 				break;
1941 			}
1942 			while (remain > 0) {
1943 				struct imsg imsg_log;
1944 				size_t n = MIN(MAX_IMSGSIZE - IMSG_HEADER_SIZE,
1945 				    remain);
1946 
1947 				err = got_privsep_recv_imsg(&imsg_log, ibuf, n);
1948 				if (err)
1949 					return err;
1950 
1951 				if (imsg_log.hdr.type != GOT_IMSG_TAG_TAGMSG)
1952 					return got_error(GOT_ERR_PRIVSEP_MSG);
1953 
1954 				memcpy((*tag)->tagmsg + offset, imsg_log.data,
1955 				    n);
1956 				imsg_free(&imsg_log);
1957 				offset += n;
1958 				remain -= n;
1959 			}
1960 			(*tag)->tagmsg[itag->tagmsg_len] = '\0';
1961 		}
1962 
1963 		break;
1964 	default:
1965 		err = got_error(GOT_ERR_PRIVSEP_MSG);
1966 		break;
1967 	}
1968 
1969 	imsg_free(&imsg);
1970 
1971 	return err;
1972 }
1973 
1974 const struct got_error *
1975 got_privsep_init_pack_child(struct imsgbuf *ibuf, struct got_pack *pack,
1976     struct got_packidx *packidx)
1977 {
1978 	const struct got_error *err = NULL;
1979 	struct got_imsg_packidx ipackidx;
1980 	struct got_imsg_pack ipack;
1981 	int fd;
1982 
1983 	ipackidx.len = packidx->len;
1984 	ipackidx.packfile_size = pack->filesize;
1985 	fd = dup(packidx->fd);
1986 	if (fd == -1)
1987 		return got_error_from_errno("dup");
1988 
1989 	if (imsg_compose(ibuf, GOT_IMSG_PACKIDX, 0, 0, fd, &ipackidx,
1990 	    sizeof(ipackidx)) == -1) {
1991 		err = got_error_from_errno("imsg_compose PACKIDX");
1992 		close(fd);
1993 		return err;
1994 	}
1995 
1996 	if (strlcpy(ipack.path_packfile, pack->path_packfile,
1997 	    sizeof(ipack.path_packfile)) >= sizeof(ipack.path_packfile))
1998 		return got_error(GOT_ERR_NO_SPACE);
1999 	ipack.filesize = pack->filesize;
2000 
2001 	fd = dup(pack->fd);
2002 	if (fd == -1)
2003 		return got_error_from_errno("dup");
2004 
2005 	if (imsg_compose(ibuf, GOT_IMSG_PACK, 0, 0, fd, &ipack, sizeof(ipack))
2006 	    == -1) {
2007 		err = got_error_from_errno("imsg_compose PACK");
2008 		close(fd);
2009 		return err;
2010 	}
2011 
2012 	return flush_imsg(ibuf);
2013 }
2014 
2015 const struct got_error *
2016 got_privsep_send_packed_obj_req(struct imsgbuf *ibuf, int idx,
2017     struct got_object_id *id)
2018 {
2019 	struct got_imsg_packed_object iobj;
2020 
2021 	iobj.idx = idx;
2022 	memcpy(iobj.id, id->sha1, sizeof(iobj.id));
2023 
2024 	if (imsg_compose(ibuf, GOT_IMSG_PACKED_OBJECT_REQUEST, 0, 0, -1,
2025 	    &iobj, sizeof(iobj)) == -1)
2026 		return got_error_from_errno("imsg_compose "
2027 		    "PACKED_OBJECT_REQUEST");
2028 
2029 	return flush_imsg(ibuf);
2030 }
2031 
2032 const struct got_error *
2033 got_privsep_send_packed_raw_obj_req(struct imsgbuf *ibuf, int idx,
2034     struct got_object_id *id)
2035 {
2036 	struct got_imsg_packed_object iobj;
2037 
2038 	iobj.idx = idx;
2039 	memcpy(iobj.id, id->sha1, sizeof(iobj.id));
2040 
2041 	if (imsg_compose(ibuf, GOT_IMSG_PACKED_RAW_OBJECT_REQUEST, 0, 0, -1,
2042 	    &iobj, sizeof(iobj)) == -1)
2043 		return got_error_from_errno("imsg_compose "
2044 		    "PACKED_OBJECT_REQUEST");
2045 
2046 	return flush_imsg(ibuf);
2047 }
2048 
2049 const struct got_error *
2050 got_privsep_send_gitconfig_parse_req(struct imsgbuf *ibuf, int fd)
2051 {
2052 	const struct got_error *err = NULL;
2053 
2054 	if (imsg_compose(ibuf, GOT_IMSG_GITCONFIG_PARSE_REQUEST, 0, 0, fd,
2055 	    NULL, 0) == -1) {
2056 		err = got_error_from_errno("imsg_compose "
2057 		    "GITCONFIG_PARSE_REQUEST");
2058 		close(fd);
2059 		return err;
2060 	}
2061 
2062 	return flush_imsg(ibuf);
2063 }
2064 
2065 const struct got_error *
2066 got_privsep_send_gitconfig_repository_format_version_req(struct imsgbuf *ibuf)
2067 {
2068 	if (imsg_compose(ibuf,
2069 	    GOT_IMSG_GITCONFIG_REPOSITORY_FORMAT_VERSION_REQUEST, 0, 0, -1,
2070 	    NULL, 0) == -1)
2071 		return got_error_from_errno("imsg_compose "
2072 		    "GITCONFIG_REPOSITORY_FORMAT_VERSION_REQUEST");
2073 
2074 	return flush_imsg(ibuf);
2075 }
2076 
2077 const struct got_error *
2078 got_privsep_send_gitconfig_repository_extensions_req(struct imsgbuf *ibuf)
2079 {
2080 	if (imsg_compose(ibuf,
2081 	    GOT_IMSG_GITCONFIG_REPOSITORY_EXTENSIONS_REQUEST, 0, 0, -1,
2082 	    NULL, 0) == -1)
2083 		return got_error_from_errno("imsg_compose "
2084 		    "GITCONFIG_REPOSITORY_EXTENSIONS_REQUEST");
2085 
2086 	return flush_imsg(ibuf);
2087 }
2088 
2089 
2090 const struct got_error *
2091 got_privsep_send_gitconfig_author_name_req(struct imsgbuf *ibuf)
2092 {
2093 	if (imsg_compose(ibuf,
2094 	    GOT_IMSG_GITCONFIG_AUTHOR_NAME_REQUEST, 0, 0, -1, NULL, 0) == -1)
2095 		return got_error_from_errno("imsg_compose "
2096 		    "GITCONFIG_AUTHOR_NAME_REQUEST");
2097 
2098 	return flush_imsg(ibuf);
2099 }
2100 
2101 const struct got_error *
2102 got_privsep_send_gitconfig_author_email_req(struct imsgbuf *ibuf)
2103 {
2104 	if (imsg_compose(ibuf,
2105 	    GOT_IMSG_GITCONFIG_AUTHOR_EMAIL_REQUEST, 0, 0, -1, NULL, 0) == -1)
2106 		return got_error_from_errno("imsg_compose "
2107 		    "GITCONFIG_AUTHOR_EMAIL_REQUEST");
2108 
2109 	return flush_imsg(ibuf);
2110 }
2111 
2112 const struct got_error *
2113 got_privsep_send_gitconfig_remotes_req(struct imsgbuf *ibuf)
2114 {
2115 	if (imsg_compose(ibuf,
2116 	    GOT_IMSG_GITCONFIG_REMOTES_REQUEST, 0, 0, -1, NULL, 0) == -1)
2117 		return got_error_from_errno("imsg_compose "
2118 		    "GITCONFIG_REMOTE_REQUEST");
2119 
2120 	return flush_imsg(ibuf);
2121 }
2122 
2123 const struct got_error *
2124 got_privsep_send_gitconfig_owner_req(struct imsgbuf *ibuf)
2125 {
2126 	if (imsg_compose(ibuf,
2127 	    GOT_IMSG_GITCONFIG_OWNER_REQUEST, 0, 0, -1, NULL, 0) == -1)
2128 		return got_error_from_errno("imsg_compose "
2129 		    "GITCONFIG_OWNER_REQUEST");
2130 
2131 	return flush_imsg(ibuf);
2132 }
2133 
2134 const struct got_error *
2135 got_privsep_recv_gitconfig_str(char **str, struct imsgbuf *ibuf)
2136 {
2137 	const struct got_error *err = NULL;
2138 	struct imsg imsg;
2139 	size_t datalen;
2140 	const size_t min_datalen = 0;
2141 
2142 	*str = NULL;
2143 
2144 	err = got_privsep_recv_imsg(&imsg, ibuf, min_datalen);
2145 	if (err)
2146 		return err;
2147 	datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
2148 
2149 	switch (imsg.hdr.type) {
2150 	case GOT_IMSG_GITCONFIG_STR_VAL:
2151 		if (datalen == 0)
2152 			break;
2153 		/* datalen does not include terminating \0 */
2154 		*str = malloc(datalen + 1);
2155 		if (*str == NULL) {
2156 			err = got_error_from_errno("malloc");
2157 			break;
2158 		}
2159 		memcpy(*str, imsg.data, datalen);
2160 		(*str)[datalen] = '\0';
2161 		break;
2162 	default:
2163 		err = got_error(GOT_ERR_PRIVSEP_MSG);
2164 		break;
2165 	}
2166 
2167 	imsg_free(&imsg);
2168 	return err;
2169 }
2170 
2171 const struct got_error *
2172 got_privsep_recv_gitconfig_int(int *val, struct imsgbuf *ibuf)
2173 {
2174 	const struct got_error *err = NULL;
2175 	struct imsg imsg;
2176 	size_t datalen;
2177 	const size_t min_datalen =
2178 	    MIN(sizeof(struct got_imsg_error), sizeof(int));
2179 
2180 	*val = 0;
2181 
2182 	err = got_privsep_recv_imsg(&imsg, ibuf, min_datalen);
2183 	if (err)
2184 		return err;
2185 	datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
2186 
2187 	switch (imsg.hdr.type) {
2188 	case GOT_IMSG_GITCONFIG_INT_VAL:
2189 		if (datalen != sizeof(*val)) {
2190 			err = got_error(GOT_ERR_PRIVSEP_LEN);
2191 			break;
2192 		}
2193 		memcpy(val, imsg.data, sizeof(*val));
2194 		break;
2195 	default:
2196 		err = got_error(GOT_ERR_PRIVSEP_MSG);
2197 		break;
2198 	}
2199 
2200 	imsg_free(&imsg);
2201 	return err;
2202 }
2203 
2204 static void
2205 free_remote_data(struct got_remote_repo *remote)
2206 {
2207 	int i;
2208 
2209 	free(remote->name);
2210 	free(remote->fetch_url);
2211 	free(remote->send_url);
2212 	for (i = 0; i < remote->nfetch_branches; i++)
2213 		free(remote->fetch_branches[i]);
2214 	free(remote->fetch_branches);
2215 	for (i = 0; i < remote->nsend_branches; i++)
2216 		free(remote->send_branches[i]);
2217 	free(remote->send_branches);
2218 	for (i = 0; i < remote->nfetch_refs; i++)
2219 		free(remote->fetch_refs[i]);
2220 	free(remote->fetch_refs);
2221 }
2222 
2223 const struct got_error *
2224 got_privsep_recv_gitconfig_remotes(struct got_remote_repo **remotes,
2225     int *nremotes, struct imsgbuf *ibuf)
2226 {
2227 	const struct got_error *err = NULL;
2228 	struct imsg imsg;
2229 	size_t datalen;
2230 	struct got_imsg_remotes iremotes;
2231 	struct got_imsg_remote iremote;
2232 
2233 	*remotes = NULL;
2234 	*nremotes = 0;
2235 	iremotes.nremotes = 0;
2236 
2237 	err = got_privsep_recv_imsg(&imsg, ibuf, sizeof(iremotes));
2238 	if (err)
2239 		return err;
2240 	datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
2241 
2242 	switch (imsg.hdr.type) {
2243 	case GOT_IMSG_GITCONFIG_REMOTES:
2244 		if (datalen != sizeof(iremotes)) {
2245 			err = got_error(GOT_ERR_PRIVSEP_LEN);
2246 			break;
2247 		}
2248 		memcpy(&iremotes, imsg.data, sizeof(iremotes));
2249 		if (iremotes.nremotes == 0) {
2250 			imsg_free(&imsg);
2251 			return NULL;
2252 		}
2253 		break;
2254 	default:
2255 		imsg_free(&imsg);
2256 		return got_error(GOT_ERR_PRIVSEP_MSG);
2257 	}
2258 
2259 	imsg_free(&imsg);
2260 
2261 	*remotes = recallocarray(NULL, 0, iremotes.nremotes, sizeof(**remotes));
2262 	if (*remotes == NULL)
2263 		return got_error_from_errno("recallocarray");
2264 
2265 	while (*nremotes < iremotes.nremotes) {
2266 		struct got_remote_repo *remote;
2267 
2268 		err = got_privsep_recv_imsg(&imsg, ibuf, sizeof(iremote));
2269 		if (err)
2270 			break;
2271 		datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
2272 
2273 		switch (imsg.hdr.type) {
2274 		case GOT_IMSG_GITCONFIG_REMOTE:
2275 			remote = &(*remotes)[*nremotes];
2276 			memset(remote, 0, sizeof(*remote));
2277 			if (datalen < sizeof(iremote)) {
2278 				err = got_error(GOT_ERR_PRIVSEP_LEN);
2279 				break;
2280 			}
2281 			memcpy(&iremote, imsg.data, sizeof(iremote));
2282 			if (iremote.name_len == 0 ||
2283 			    iremote.fetch_url_len == 0 ||
2284 			    iremote.send_url_len == 0 ||
2285 			    (sizeof(iremote) + iremote.name_len +
2286 			    iremote.fetch_url_len + iremote.send_url_len) > datalen) {
2287 				err = got_error(GOT_ERR_PRIVSEP_LEN);
2288 				break;
2289 			}
2290 			remote->name = strndup(imsg.data + sizeof(iremote),
2291 			    iremote.name_len);
2292 			if (remote->name == NULL) {
2293 				err = got_error_from_errno("strndup");
2294 				break;
2295 			}
2296 			remote->fetch_url = strndup(imsg.data + sizeof(iremote) +
2297 			    iremote.name_len, iremote.fetch_url_len);
2298 			if (remote->fetch_url == NULL) {
2299 				err = got_error_from_errno("strndup");
2300 				free_remote_data(remote);
2301 				break;
2302 			}
2303 			remote->send_url = strndup(imsg.data + sizeof(iremote) +
2304 			    iremote.name_len + iremote.fetch_url_len,
2305 			    iremote.send_url_len);
2306 			if (remote->send_url == NULL) {
2307 				err = got_error_from_errno("strndup");
2308 				free_remote_data(remote);
2309 				break;
2310 			}
2311 			remote->mirror_references = iremote.mirror_references;
2312 			remote->fetch_all_branches = iremote.fetch_all_branches;
2313 			remote->nfetch_branches = 0;
2314 			remote->fetch_branches = NULL;
2315 			remote->nsend_branches = 0;
2316 			remote->send_branches = NULL;
2317 			remote->nfetch_refs = 0;
2318 			remote->fetch_refs = NULL;
2319 			(*nremotes)++;
2320 			break;
2321 		default:
2322 			err = got_error(GOT_ERR_PRIVSEP_MSG);
2323 			break;
2324 		}
2325 
2326 		imsg_free(&imsg);
2327 		if (err)
2328 			break;
2329 	}
2330 
2331 	if (err) {
2332 		int i;
2333 		for (i = 0; i < *nremotes; i++)
2334 			free_remote_data(&(*remotes)[i]);
2335 		free(*remotes);
2336 		*remotes = NULL;
2337 		*nremotes = 0;
2338 	}
2339 	return err;
2340 }
2341 
2342 const struct got_error *
2343 got_privsep_send_gotconfig_parse_req(struct imsgbuf *ibuf, int fd)
2344 {
2345 	const struct got_error *err = NULL;
2346 
2347 	if (imsg_compose(ibuf, GOT_IMSG_GOTCONFIG_PARSE_REQUEST, 0, 0, fd,
2348 	    NULL, 0) == -1) {
2349 		err = got_error_from_errno("imsg_compose "
2350 		    "GOTCONFIG_PARSE_REQUEST");
2351 		close(fd);
2352 		return err;
2353 	}
2354 
2355 	return flush_imsg(ibuf);
2356 }
2357 
2358 const struct got_error *
2359 got_privsep_send_gotconfig_author_req(struct imsgbuf *ibuf)
2360 {
2361 	if (imsg_compose(ibuf,
2362 	    GOT_IMSG_GOTCONFIG_AUTHOR_REQUEST, 0, 0, -1, NULL, 0) == -1)
2363 		return got_error_from_errno("imsg_compose "
2364 		    "GOTCONFIG_AUTHOR_REQUEST");
2365 
2366 	return flush_imsg(ibuf);
2367 }
2368 
2369 const struct got_error *
2370 got_privsep_send_gotconfig_remotes_req(struct imsgbuf *ibuf)
2371 {
2372 	if (imsg_compose(ibuf,
2373 	    GOT_IMSG_GOTCONFIG_REMOTES_REQUEST, 0, 0, -1, NULL, 0) == -1)
2374 		return got_error_from_errno("imsg_compose "
2375 		    "GOTCONFIG_REMOTE_REQUEST");
2376 
2377 	return flush_imsg(ibuf);
2378 }
2379 
2380 const struct got_error *
2381 got_privsep_recv_gotconfig_str(char **str, struct imsgbuf *ibuf)
2382 {
2383 	const struct got_error *err = NULL;
2384 	struct imsg imsg;
2385 	size_t datalen;
2386 	const size_t min_datalen = 0;
2387 
2388 	*str = NULL;
2389 
2390 	err = got_privsep_recv_imsg(&imsg, ibuf, min_datalen);
2391 	if (err)
2392 		return err;
2393 	datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
2394 
2395 	switch (imsg.hdr.type) {
2396 	case GOT_IMSG_ERROR:
2397 		if (datalen < sizeof(struct got_imsg_error)) {
2398 			err = got_error(GOT_ERR_PRIVSEP_LEN);
2399 			break;
2400 		}
2401 		err = recv_imsg_error(&imsg, datalen);
2402 		break;
2403 	case GOT_IMSG_GOTCONFIG_STR_VAL:
2404 		if (datalen == 0)
2405 			break;
2406 		/* datalen does not include terminating \0 */
2407 		*str = malloc(datalen + 1);
2408 		if (*str == NULL) {
2409 			err = got_error_from_errno("malloc");
2410 			break;
2411 		}
2412 		memcpy(*str, imsg.data, datalen);
2413 		(*str)[datalen] = '\0';
2414 		break;
2415 	default:
2416 		err = got_error(GOT_ERR_PRIVSEP_MSG);
2417 		break;
2418 	}
2419 
2420 	imsg_free(&imsg);
2421 	return err;
2422 }
2423 
2424 const struct got_error *
2425 got_privsep_recv_gotconfig_remotes(struct got_remote_repo **remotes,
2426     int *nremotes, struct imsgbuf *ibuf)
2427 {
2428 	const struct got_error *err = NULL;
2429 	struct imsg imsg;
2430 	size_t datalen;
2431 	struct got_imsg_remotes iremotes;
2432 	struct got_imsg_remote iremote;
2433 	const size_t min_datalen =
2434 	    MIN(sizeof(struct got_imsg_error), sizeof(iremotes));
2435 
2436 	*remotes = NULL;
2437 	*nremotes = 0;
2438 	iremotes.nremotes = 0;
2439 
2440 	err = got_privsep_recv_imsg(&imsg, ibuf, min_datalen);
2441 	if (err)
2442 		return err;
2443 	datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
2444 
2445 	switch (imsg.hdr.type) {
2446 	case GOT_IMSG_ERROR:
2447 		if (datalen < sizeof(struct got_imsg_error)) {
2448 			err = got_error(GOT_ERR_PRIVSEP_LEN);
2449 			break;
2450 		}
2451 		err = recv_imsg_error(&imsg, datalen);
2452 		break;
2453 	case GOT_IMSG_GOTCONFIG_REMOTES:
2454 		if (datalen != sizeof(iremotes)) {
2455 			err = got_error(GOT_ERR_PRIVSEP_LEN);
2456 			break;
2457 		}
2458 		memcpy(&iremotes, imsg.data, sizeof(iremotes));
2459 		if (iremotes.nremotes == 0) {
2460 			imsg_free(&imsg);
2461 			return NULL;
2462 		}
2463 		break;
2464 	default:
2465 		imsg_free(&imsg);
2466 		return got_error(GOT_ERR_PRIVSEP_MSG);
2467 	}
2468 
2469 	imsg_free(&imsg);
2470 
2471 	*remotes = recallocarray(NULL, 0, iremotes.nremotes, sizeof(**remotes));
2472 	if (*remotes == NULL)
2473 		return got_error_from_errno("recallocarray");
2474 
2475 	while (*nremotes < iremotes.nremotes) {
2476 		struct got_remote_repo *remote;
2477 		const size_t min_datalen =
2478 		    MIN(sizeof(struct got_imsg_error), sizeof(iremote));
2479 		int i;
2480 
2481 		err = got_privsep_recv_imsg(&imsg, ibuf, min_datalen);
2482 		if (err)
2483 			break;
2484 		datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
2485 
2486 		switch (imsg.hdr.type) {
2487 		case GOT_IMSG_ERROR:
2488 			if (datalen < sizeof(struct got_imsg_error)) {
2489 				err = got_error(GOT_ERR_PRIVSEP_LEN);
2490 				break;
2491 			}
2492 			err = recv_imsg_error(&imsg, datalen);
2493 			break;
2494 		case GOT_IMSG_GOTCONFIG_REMOTE:
2495 			remote = &(*remotes)[*nremotes];
2496 			memset(remote, 0, sizeof(*remote));
2497 			if (datalen < sizeof(iremote)) {
2498 				err = got_error(GOT_ERR_PRIVSEP_LEN);
2499 				break;
2500 			}
2501 			memcpy(&iremote, imsg.data, sizeof(iremote));
2502 			if (iremote.name_len == 0 ||
2503 			    (iremote.fetch_url_len == 0 &&
2504 			    iremote.send_url_len == 0) ||
2505 			    (sizeof(iremote) + iremote.name_len +
2506 			    iremote.fetch_url_len + iremote.send_url_len) >
2507 			    datalen) {
2508 				err = got_error(GOT_ERR_PRIVSEP_LEN);
2509 				break;
2510 			}
2511 			remote->name = strndup(imsg.data + sizeof(iremote),
2512 			    iremote.name_len);
2513 			if (remote->name == NULL) {
2514 				err = got_error_from_errno("strndup");
2515 				break;
2516 			}
2517 			remote->fetch_url = strndup(imsg.data +
2518 			    sizeof(iremote) + iremote.name_len,
2519 			    iremote.fetch_url_len);
2520 			if (remote->fetch_url == NULL) {
2521 				err = got_error_from_errno("strndup");
2522 				free_remote_data(remote);
2523 				break;
2524 			}
2525 			remote->send_url = strndup(imsg.data +
2526 			    sizeof(iremote) + iremote.name_len +
2527 			    iremote.fetch_url_len, iremote.send_url_len);
2528 			if (remote->send_url == NULL) {
2529 				err = got_error_from_errno("strndup");
2530 				free_remote_data(remote);
2531 				break;
2532 			}
2533 			remote->mirror_references = iremote.mirror_references;
2534 			remote->fetch_all_branches = iremote.fetch_all_branches;
2535 			if (iremote.nfetch_branches > 0) {
2536 				remote->fetch_branches = recallocarray(NULL, 0,
2537 				    iremote.nfetch_branches, sizeof(char *));
2538 				if (remote->fetch_branches == NULL) {
2539 					err = got_error_from_errno("calloc");
2540 					free_remote_data(remote);
2541 					break;
2542 				}
2543 			}
2544 			remote->nfetch_branches = 0;
2545 			for (i = 0; i < iremote.nfetch_branches; i++) {
2546 				char *branch;
2547 				err = got_privsep_recv_gotconfig_str(&branch,
2548 				    ibuf);
2549 				if (err) {
2550 					free_remote_data(remote);
2551 					goto done;
2552 				}
2553 				remote->fetch_branches[i] = branch;
2554 				remote->nfetch_branches++;
2555 			}
2556 			if (iremote.nsend_branches > 0) {
2557 				remote->send_branches = recallocarray(NULL, 0,
2558 				    iremote.nsend_branches, sizeof(char *));
2559 				if (remote->send_branches == NULL) {
2560 					err = got_error_from_errno("calloc");
2561 					free_remote_data(remote);
2562 					break;
2563 				}
2564 			}
2565 			remote->nsend_branches = 0;
2566 			for (i = 0; i < iremote.nsend_branches; i++) {
2567 				char *branch;
2568 				err = got_privsep_recv_gotconfig_str(&branch,
2569 				    ibuf);
2570 				if (err) {
2571 					free_remote_data(remote);
2572 					goto done;
2573 				}
2574 				remote->send_branches[i] = branch;
2575 				remote->nsend_branches++;
2576 			}
2577 			if (iremote.nfetch_refs > 0) {
2578 				remote->fetch_refs = recallocarray(NULL, 0,
2579 				    iremote.nfetch_refs, sizeof(char *));
2580 				if (remote->fetch_refs == NULL) {
2581 					err = got_error_from_errno("calloc");
2582 					free_remote_data(remote);
2583 					break;
2584 				}
2585 			}
2586 			remote->nfetch_refs = 0;
2587 			for (i = 0; i < iremote.nfetch_refs; i++) {
2588 				char *ref;
2589 				err = got_privsep_recv_gotconfig_str(&ref,
2590 				    ibuf);
2591 				if (err) {
2592 					free_remote_data(remote);
2593 					goto done;
2594 				}
2595 				remote->fetch_refs[i] = ref;
2596 				remote->nfetch_refs++;
2597 			}
2598 			(*nremotes)++;
2599 			break;
2600 		default:
2601 			err = got_error(GOT_ERR_PRIVSEP_MSG);
2602 			break;
2603 		}
2604 
2605 		imsg_free(&imsg);
2606 		if (err)
2607 			break;
2608 	}
2609 done:
2610 	if (err) {
2611 		int i;
2612 		for (i = 0; i < *nremotes; i++)
2613 			free_remote_data(&(*remotes)[i]);
2614 		free(*remotes);
2615 		*remotes = NULL;
2616 		*nremotes = 0;
2617 	}
2618 	return err;
2619 }
2620 
2621 const struct got_error *
2622 got_privsep_send_commit_traversal_request(struct imsgbuf *ibuf,
2623     struct got_object_id *id, int idx, const char *path)
2624 {
2625 	const struct got_error *err = NULL;
2626 	struct ibuf *wbuf;
2627 	size_t path_len = strlen(path) + 1;
2628 
2629 	wbuf = imsg_create(ibuf, GOT_IMSG_COMMIT_TRAVERSAL_REQUEST, 0, 0,
2630 	    sizeof(struct got_imsg_commit_traversal_request) + path_len);
2631 	if (wbuf == NULL)
2632 		return got_error_from_errno(
2633 		    "imsg_create COMMIT_TRAVERSAL_REQUEST");
2634 	if (imsg_add(wbuf, id->sha1, SHA1_DIGEST_LENGTH) == -1) {
2635 		err = got_error_from_errno("imsg_add COMMIT_TRAVERSAL_REQUEST");
2636 		ibuf_free(wbuf);
2637 		return err;
2638 	}
2639 	if (imsg_add(wbuf, &idx, sizeof(idx)) == -1) {
2640 		err = got_error_from_errno("imsg_add COMMIT_TRAVERSAL_REQUEST");
2641 		ibuf_free(wbuf);
2642 		return err;
2643 	}
2644 	if (imsg_add(wbuf, path, path_len) == -1) {
2645 		err = got_error_from_errno("imsg_add COMMIT_TRAVERSAL_REQUEST");
2646 		ibuf_free(wbuf);
2647 		return err;
2648 	}
2649 
2650 	wbuf->fd = -1;
2651 	imsg_close(ibuf, wbuf);
2652 
2653 	return flush_imsg(ibuf);
2654 }
2655 
2656 const struct got_error *
2657 got_privsep_recv_traversed_commits(struct got_commit_object **changed_commit,
2658     struct got_object_id **changed_commit_id,
2659     struct got_object_id_queue *commit_ids, struct imsgbuf *ibuf)
2660 {
2661 	const struct got_error *err = NULL;
2662 	struct imsg imsg;
2663 	struct got_imsg_traversed_commits *icommits;
2664 	size_t datalen;
2665 	int i, done = 0;
2666 
2667 	*changed_commit = NULL;
2668 	*changed_commit_id = NULL;
2669 
2670 	while (!done) {
2671 		err = got_privsep_recv_imsg(&imsg, ibuf, 0);
2672 		if (err)
2673 			return err;
2674 
2675 		datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
2676 		switch (imsg.hdr.type) {
2677 		case GOT_IMSG_TRAVERSED_COMMITS:
2678 			icommits = imsg.data;
2679 			if (datalen != sizeof(*icommits) +
2680 			    icommits->ncommits * SHA1_DIGEST_LENGTH) {
2681 				err = got_error(GOT_ERR_PRIVSEP_LEN);
2682 				break;
2683 			}
2684 			for (i = 0; i < icommits->ncommits; i++) {
2685 				struct got_object_qid *qid;
2686 				uint8_t *sha1 = (uint8_t *)imsg.data +
2687 				    sizeof(*icommits) + i * SHA1_DIGEST_LENGTH;
2688 				err = got_object_qid_alloc_partial(&qid);
2689 				if (err)
2690 					break;
2691 				memcpy(qid->id.sha1, sha1, SHA1_DIGEST_LENGTH);
2692 				STAILQ_INSERT_TAIL(commit_ids, qid, entry);
2693 
2694 				/* The last commit may contain a change. */
2695 				if (i == icommits->ncommits - 1) {
2696 					*changed_commit_id =
2697 					    got_object_id_dup(&qid->id);
2698 					if (*changed_commit_id == NULL) {
2699 						err = got_error_from_errno(
2700 						    "got_object_id_dup");
2701 						break;
2702 					}
2703 				}
2704 			}
2705 			break;
2706 		case GOT_IMSG_COMMIT:
2707 			if (*changed_commit_id == NULL) {
2708 				err = got_error(GOT_ERR_PRIVSEP_MSG);
2709 				break;
2710 			}
2711 			err = get_commit_from_imsg(changed_commit, &imsg,
2712 			    datalen, ibuf);
2713 			break;
2714 		case GOT_IMSG_COMMIT_TRAVERSAL_DONE:
2715 			done = 1;
2716 			break;
2717 		default:
2718 			err = got_error(GOT_ERR_PRIVSEP_MSG);
2719 			break;
2720 		}
2721 
2722 		imsg_free(&imsg);
2723 		if (err)
2724 			break;
2725 	}
2726 
2727 	if (err)
2728 		got_object_id_queue_free(commit_ids);
2729 	return err;
2730 }
2731 
2732 const struct got_error *
2733 got_privsep_send_raw_delta_req(struct imsgbuf *ibuf, int idx,
2734     struct got_object_id *id)
2735 {
2736 	struct got_imsg_raw_delta_request dreq;
2737 
2738 	dreq.idx = idx;
2739 	memcpy(dreq.id, id->sha1, SHA1_DIGEST_LENGTH);
2740 
2741 	if (imsg_compose(ibuf, GOT_IMSG_RAW_DELTA_REQUEST, 0, 0, -1,
2742 	    &dreq, sizeof(dreq)) == -1)
2743 		return got_error_from_errno("imsg_compose RAW_DELTA_REQUEST");
2744 
2745 	return flush_imsg(ibuf);
2746 }
2747 
2748 const struct got_error *
2749 got_privsep_send_raw_delta_outfd(struct imsgbuf *ibuf, int fd)
2750 {
2751 	return send_fd(ibuf, GOT_IMSG_RAW_DELTA_OUTFD, fd);
2752 }
2753 
2754 const struct got_error *
2755 got_privsep_send_raw_delta(struct imsgbuf *ibuf, uint64_t base_size,
2756     uint64_t result_size,  off_t delta_size, off_t delta_offset,
2757     off_t delta_out_offset, struct got_object_id *base_id)
2758 {
2759 	struct got_imsg_raw_delta idelta;
2760 	int ret;
2761 
2762 	idelta.base_size = base_size;
2763 	idelta.result_size = result_size;
2764 	idelta.delta_size = delta_size;
2765 	idelta.delta_offset = delta_offset;
2766 	idelta.delta_out_offset = delta_out_offset;
2767 	memcpy(idelta.base_id, base_id->sha1, SHA1_DIGEST_LENGTH);
2768 
2769 	ret = imsg_compose(ibuf, GOT_IMSG_RAW_DELTA, 0, 0, -1,
2770 	    &idelta, sizeof(idelta));
2771 	if (ret == -1)
2772 		return got_error_from_errno("imsg_compose RAW_DELTA");
2773 
2774 	return flush_imsg(ibuf);
2775 }
2776 
2777 const struct got_error *
2778 got_privsep_recv_raw_delta(uint64_t *base_size, uint64_t *result_size,
2779     off_t *delta_size, off_t *delta_offset, off_t *delta_out_offset,
2780     struct got_object_id **base_id, struct imsgbuf *ibuf)
2781 {
2782 	const struct got_error *err = NULL;
2783 	struct imsg imsg;
2784 	struct got_imsg_raw_delta *delta;
2785 	size_t datalen;
2786 
2787 	*base_size = 0;
2788 	*result_size = 0;
2789 	*delta_size = 0;
2790 	*delta_offset = 0;
2791 	*delta_out_offset = 0;
2792 	*base_id = NULL;
2793 
2794 	err = got_privsep_recv_imsg(&imsg, ibuf, 0);
2795 	if (err)
2796 		return err;
2797 
2798 	datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
2799 
2800 	switch (imsg.hdr.type) {
2801 	case GOT_IMSG_RAW_DELTA:
2802 		if (datalen != sizeof(*delta)) {
2803 			err = got_error(GOT_ERR_PRIVSEP_LEN);
2804 			break;
2805 		}
2806 		delta = imsg.data;
2807 		*base_size = delta->base_size;
2808 		*result_size = delta->result_size;
2809 		*delta_size = delta->delta_size;
2810 		*delta_offset = delta->delta_offset;
2811 		*delta_out_offset = delta->delta_out_offset;
2812 		*base_id = calloc(1, sizeof(**base_id));
2813 		if (*base_id == NULL) {
2814 			err = got_error_from_errno("malloc");
2815 			break;
2816 		}
2817 		memcpy((*base_id)->sha1, delta->base_id, SHA1_DIGEST_LENGTH);
2818 		break;
2819 	default:
2820 		err = got_error(GOT_ERR_PRIVSEP_MSG);
2821 		break;
2822 	}
2823 
2824 	imsg_free(&imsg);
2825 
2826 	if (err) {
2827 		free(*base_id);
2828 		*base_id = NULL;
2829 	}
2830 	return err;
2831 }
2832 
2833 const struct got_error *
2834 got_privsep_unveil_exec_helpers(void)
2835 {
2836 	const char *helpers[] = {
2837 	    GOT_PATH_PROG_READ_PACK,
2838 	    GOT_PATH_PROG_READ_OBJECT,
2839 	    GOT_PATH_PROG_READ_COMMIT,
2840 	    GOT_PATH_PROG_READ_TREE,
2841 	    GOT_PATH_PROG_READ_BLOB,
2842 	    GOT_PATH_PROG_READ_TAG,
2843 	    GOT_PATH_PROG_READ_GITCONFIG,
2844 	    GOT_PATH_PROG_READ_GOTCONFIG,
2845 	    GOT_PATH_PROG_READ_PATCH,
2846 	    GOT_PATH_PROG_FETCH_PACK,
2847 	    GOT_PATH_PROG_INDEX_PACK,
2848 	    GOT_PATH_PROG_SEND_PACK,
2849 	};
2850 	size_t i;
2851 
2852 	for (i = 0; i < nitems(helpers); i++) {
2853 		if (unveil(helpers[i], "x") == 0)
2854 			continue;
2855 		return got_error_from_errno2("unveil", helpers[i]);
2856 	}
2857 
2858 	return NULL;
2859 }
2860 
2861 void
2862 got_privsep_exec_child(int imsg_fds[2], const char *path, const char *repo_path)
2863 {
2864 	if (close(imsg_fds[0]) == -1) {
2865 		fprintf(stderr, "%s: %s\n", getprogname(), strerror(errno));
2866 		_exit(1);
2867 	}
2868 
2869 	if (dup2(imsg_fds[1], GOT_IMSG_FD_CHILD) == -1) {
2870 		fprintf(stderr, "%s: %s\n", getprogname(), strerror(errno));
2871 		_exit(1);
2872 	}
2873 
2874 	closefrom(GOT_IMSG_FD_CHILD + 1);
2875 
2876 	if (execl(path, path, repo_path, (char *)NULL) == -1) {
2877 		fprintf(stderr, "%s: %s: %s\n", getprogname(), path,
2878 		    strerror(errno));
2879 		_exit(1);
2880 	}
2881 }