Game of Trees Repos

Blob

Date:: Mon Feb 26 17:03:34 2024 UTC
Message:: adjust min_datalen in a few places Fix the computation of min_datalen that was forgotten in 8f137979fc5e284a136cf8950e8b3895d7ea208b. got_privsep_recv_imsg() already takes care of converting GOT_IMSG_ERROR to errors, so just how we didn't need to call recv_imsg_error() at all, we don't need to include it in the requested min_datalen.
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 <sha2.h>
35 #include <unistd.h>
36 #include <zlib.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_hash.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_object_qid.h"
49 #include "got_lib_privsep.h"
50 #include "got_lib_pack.h"
51 #include "got_lib_poll.h"
52 
53 #include "got_privsep.h"
54 
55 #ifndef MIN
56 #define	MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
57 #endif
58 
59 #ifndef nitems
60 #define nitems(_a)	(sizeof((_a)) / sizeof((_a)[0]))
61 #endif
62 
63 static const struct got_error *
64 read_imsg(struct imsgbuf *ibuf)
65 {
66 	const struct got_error *err;
67 	size_t n;
68 
69 	err = got_poll_fd(ibuf->fd, POLLIN, INFTIM);
70 	if (err) {
71 		if (err->code == GOT_ERR_EOF)
72 			return got_error(GOT_ERR_PRIVSEP_PIPE);
73 		return err;
74 	}
75 
76 	n = imsg_read(ibuf);
77 	if (n == -1) {
78 		if (errno == EAGAIN) /* Could be a file-descriptor leak. */
79 			return got_error(GOT_ERR_PRIVSEP_NO_FD);
80 		return got_error(GOT_ERR_PRIVSEP_READ);
81 	}
82 	if (n == 0)
83 		return got_error(GOT_ERR_PRIVSEP_PIPE);
84 
85 	return NULL;
86 }
87 
88 const struct got_error *
89 got_privsep_wait_for_child(pid_t pid)
90 {
91 	int child_status;
92 
93 	if (waitpid(pid, &child_status, 0) == -1)
94 		return got_error_from_errno("waitpid");
95 
96 	if (!WIFEXITED(child_status))
97 		return got_error(GOT_ERR_PRIVSEP_DIED);
98 
99 	if (WEXITSTATUS(child_status) != 0)
100 		return got_error(GOT_ERR_PRIVSEP_EXIT);
101 
102 	return NULL;
103 }
104 
105 static const struct got_error *
106 recv_imsg_error(struct imsg *imsg, size_t datalen)
107 {
108 	struct got_imsg_error *ierr;
109 
110 	if (datalen != sizeof(*ierr))
111 		return got_error(GOT_ERR_PRIVSEP_LEN);
112 
113 	ierr = imsg->data;
114 	if (ierr->code == GOT_ERR_ERRNO) {
115 		static struct got_error serr;
116 		serr.code = GOT_ERR_ERRNO;
117 		serr.msg = strerror(ierr->errno_code);
118 		return &serr;
119 	}
120 
121 	return got_error(ierr->code);
122 }
123 
124 const struct got_error *
125 got_privsep_recv_imsg(struct imsg *imsg, struct imsgbuf *ibuf,
126     size_t min_datalen)
127 {
128 	const struct got_error *err;
129 	ssize_t n;
130 
131 	n = imsg_get(ibuf, imsg);
132 	if (n == -1)
133 		return got_error_from_errno("imsg_get");
134 
135 	while (n == 0) {
136 		err = read_imsg(ibuf);
137 		if (err)
138 			return err;
139 		n = imsg_get(ibuf, imsg);
140 		if (n == -1)
141 			return got_error_from_errno("imsg_get");
142 	}
143 
144 	if (imsg->hdr.type == GOT_IMSG_ERROR) {
145 		size_t datalen = imsg->hdr.len - IMSG_HEADER_SIZE;
146 		err = recv_imsg_error(imsg, datalen);
147 		imsg_free(imsg);
148 		return err;
149 	}
150 
151 	if (imsg->hdr.len < IMSG_HEADER_SIZE + min_datalen) {
152 		imsg_free(imsg);
153 		return got_error(GOT_ERR_PRIVSEP_LEN);
154 	}
155 
156 	return NULL;
157 }
158 
159 /* Attempt to send an error in an imsg. Complain on stderr as a last resort. */
160 void
161 got_privsep_send_error(struct imsgbuf *ibuf, const struct got_error *err)
162 {
163 	const struct got_error *poll_err;
164 	struct got_imsg_error ierr;
165 	int ret;
166 
167 	ierr.code = err->code;
168 	if (err->code == GOT_ERR_ERRNO)
169 		ierr.errno_code = errno;
170 	else
171 		ierr.errno_code = 0;
172 	ret = imsg_compose(ibuf, GOT_IMSG_ERROR, 0, 0, -1, &ierr, sizeof(ierr));
173 	if (ret == -1) {
174 		fprintf(stderr, "%s: error %d \"%s\": imsg_compose: %s\n",
175 		    getprogname(), err->code, err->msg, strerror(errno));
176 		return;
177 	}
178 
179 	poll_err = got_poll_fd(ibuf->fd, POLLOUT, INFTIM);
180 	if (poll_err) {
181 		fprintf(stderr, "%s: error %d \"%s\": poll: %s\n",
182 		    getprogname(), err->code, err->msg, poll_err->msg);
183 		return;
184 	}
185 
186 	ret = imsg_flush(ibuf);
187 	if (ret == -1) {
188 		fprintf(stderr, "%s: error %d \"%s\": imsg_flush: %s\n",
189 		    getprogname(), err->code, err->msg, strerror(errno));
190 		imsg_clear(ibuf);
191 		return;
192 	}
193 }
194 
195 static const struct got_error *
196 flush_imsg(struct imsgbuf *ibuf)
197 {
198 	const struct got_error *err;
199 
200 	err = got_poll_fd(ibuf->fd, POLLOUT, INFTIM);
201 	if (err)
202 		return err;
203 
204 	if (imsg_flush(ibuf) == -1) {
205 		imsg_clear(ibuf);
206 		return got_error_from_errno("imsg_flush");
207 	}
208 
209 	return NULL;
210 }
211 
212 const struct got_error *
213 got_privsep_flush_imsg(struct imsgbuf *ibuf)
214 {
215 	return flush_imsg(ibuf);
216 }
217 
218 const struct got_error *
219 got_privsep_send_stop(int fd)
220 {
221 	struct imsgbuf ibuf;
222 
223 	imsg_init(&ibuf, fd);
224 
225 	if (imsg_compose(&ibuf, GOT_IMSG_STOP, 0, 0, -1, NULL, 0) == -1)
226 		return got_error_from_errno("imsg_compose STOP");
227 
228 	return flush_imsg(&ibuf);
229 }
230 
231 const struct got_error *
232 got_privsep_send_obj_req(struct imsgbuf *ibuf, int fd,
233     struct got_object_id *id)
234 {
235 	if (imsg_compose(ibuf, GOT_IMSG_OBJECT_REQUEST, 0, 0, fd,
236 	    id, sizeof(*id)) == -1)
237 		return got_error_from_errno("imsg_compose OBJECT_REQUEST");
238 
239 	return flush_imsg(ibuf);
240 }
241 
242 const struct got_error *
243 got_privsep_send_raw_obj_req(struct imsgbuf *ibuf, int fd,
244     struct got_object_id *id)
245 {
246 	const struct got_error *err;
247 
248 	if (imsg_compose(ibuf, GOT_IMSG_RAW_OBJECT_REQUEST, 0, 0, fd,
249 	    id, sizeof(*id)) == -1) {
250 		err = got_error_from_errno("imsg_compose RAW_OBJECT_REQUEST");
251 		close(fd);
252 		return err;
253 	}
254 
255 	return flush_imsg(ibuf);
256 }
257 
258 const struct got_error *
259 got_privsep_send_raw_obj_outfd(struct imsgbuf *ibuf, int outfd)
260 {
261 	const struct got_error *err = NULL;
262 
263 	if (imsg_compose(ibuf, GOT_IMSG_RAW_OBJECT_OUTFD, 0, 0, outfd, NULL, 0)
264 	    == -1) {
265 		err = got_error_from_errno("imsg_compose RAW_OBJECT_OUTFD");
266 		close(outfd);
267 		return err;
268 	}
269 
270 	return flush_imsg(ibuf);
271 }
272 
273 const struct got_error *
274 got_privsep_send_raw_obj(struct imsgbuf *ibuf, off_t size, size_t hdrlen,
275     uint8_t *data)
276 {
277 	struct got_imsg_raw_obj iobj;
278 	size_t len = sizeof(iobj);
279 	struct ibuf *wbuf;
280 
281 	memset(&iobj, 0, sizeof(iobj));
282 	iobj.hdrlen = hdrlen;
283 	iobj.size = size;
284 
285 	if (data && size + hdrlen <= GOT_PRIVSEP_INLINE_OBJECT_DATA_MAX)
286 		len += (size_t)size + hdrlen;
287 
288 	wbuf = imsg_create(ibuf, GOT_IMSG_RAW_OBJECT, 0, 0, len);
289 	if (wbuf == NULL)
290 		return got_error_from_errno("imsg_create RAW_OBJECT");
291 
292 	if (imsg_add(wbuf, &iobj, sizeof(iobj)) == -1)
293 		return got_error_from_errno("imsg_add RAW_OBJECT");
294 
295 	if (data && size + hdrlen <= GOT_PRIVSEP_INLINE_OBJECT_DATA_MAX) {
296 		if (imsg_add(wbuf, data, size + hdrlen) == -1)
297 			return got_error_from_errno("imsg_add RAW_OBJECT");
298 	}
299 
300 	imsg_close(ibuf, wbuf);
301 	return flush_imsg(ibuf);
302 }
303 
304 const struct got_error *
305 got_privsep_recv_raw_obj(uint8_t **outbuf, off_t *size, size_t *hdrlen,
306     struct imsgbuf *ibuf)
307 {
308 	const struct got_error *err = NULL;
309 	struct imsg imsg;
310 	struct got_imsg_raw_obj *iobj;
311 	size_t datalen;
312 
313 	*outbuf = NULL;
314 
315 	err = got_privsep_recv_imsg(&imsg, ibuf, 0);
316 	if (err)
317 		return err;
318 
319 	datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
320 
321 	switch (imsg.hdr.type) {
322 	case GOT_IMSG_RAW_OBJECT:
323 		if (datalen < sizeof(*iobj)) {
324 			err = got_error(GOT_ERR_PRIVSEP_LEN);
325 			break;
326 		}
327 		iobj = imsg.data;
328 		*size = iobj->size;
329 		*hdrlen = iobj->hdrlen;
330 
331 		if (datalen == sizeof(*iobj)) {
332 			/* Data has been written to file descriptor. */
333 			break;
334 		}
335 
336 		if (*size < 0 ||
337 		    *size + *hdrlen > GOT_PRIVSEP_INLINE_OBJECT_DATA_MAX) {
338 			err = got_error(GOT_ERR_PRIVSEP_LEN);
339 			break;
340 		}
341 
342 		*outbuf = malloc(*size + *hdrlen);
343 		if (*outbuf == NULL) {
344 			err = got_error_from_errno("malloc");
345 			break;
346 		}
347 		memcpy(*outbuf, imsg.data + sizeof(*iobj), *size + *hdrlen);
348 		break;
349 	default:
350 		err = got_error(GOT_ERR_PRIVSEP_MSG);
351 		break;
352 	}
353 
354 	imsg_free(&imsg);
355 
356 	return err;
357 }
358 
359 const struct got_error *
360 got_privsep_send_commit_req(struct imsgbuf *ibuf, int fd,
361     struct got_object_id *id, int pack_idx)
362 {
363 	const struct got_error *err = NULL;
364 	struct got_imsg_packed_object iobj;
365 	void *data;
366 	size_t len;
367 
368 	memset(&iobj, 0, sizeof(iobj));
369 	if (pack_idx != -1) { /* commit is packed */
370 		iobj.idx = pack_idx;
371 		memcpy(&iobj.id, id, sizeof(iobj.id));
372 		data = &iobj;
373 		len = sizeof(iobj);
374 	} else {
375 		data = id;
376 		len = sizeof(*id);
377 	}
378 
379 	if (imsg_compose(ibuf, GOT_IMSG_COMMIT_REQUEST, 0, 0, fd, data, len)
380 	    == -1) {
381 		err = got_error_from_errno("imsg_compose COMMIT_REQUEST");
382 		close(fd);
383 		return err;
384 	}
385 
386 	return flush_imsg(ibuf);
387 }
388 
389 const struct got_error *
390 got_privsep_send_tree_req(struct imsgbuf *ibuf, int fd,
391     struct got_object_id *id, int pack_idx)
392 {
393 	const struct got_error *err;
394 	struct ibuf *wbuf;
395 	size_t len;
396 
397 	if (pack_idx != -1)
398 		len = sizeof(struct got_imsg_packed_object);
399 	else
400 		len = sizeof(*id);
401 
402 	wbuf = imsg_create(ibuf, GOT_IMSG_TREE_REQUEST, 0, 0, len);
403 	if (wbuf == NULL) {
404 		err = got_error_from_errno("imsg_create TREE_REQUEST");
405 		if (fd != -1)
406 			close(fd);
407 		return err;
408 	}
409 
410 	if (imsg_add(wbuf, id, sizeof(*id)) == -1) {
411 		err = got_error_from_errno("imsg_add TREE_REQUEST");
412 		if (fd != -1)
413 			close(fd);
414 		return err;
415 	}
416 
417 	if (pack_idx != -1) { /* tree is packed */
418 		if (imsg_add(wbuf, &pack_idx, sizeof(pack_idx)) == -1) {
419 			err = got_error_from_errno("imsg_add TREE_REQUEST");
420 			if (fd != -1)
421 				close(fd);
422 			return err;
423 		}
424 	}
425 
426 	ibuf_fd_set(wbuf, fd);
427 	imsg_close(ibuf, wbuf);
428 
429 	return flush_imsg(ibuf);
430 }
431 
432 const struct got_error *
433 got_privsep_send_tag_req(struct imsgbuf *ibuf, int fd,
434     struct got_object_id *id, int pack_idx)
435 {
436 	const struct got_error *err;
437 	struct got_imsg_packed_object iobj;
438 	void *data;
439 	size_t len;
440 
441 	memset(&iobj, 0, sizeof(iobj));
442 	if (pack_idx != -1) { /* tag is packed */
443 		iobj.idx = pack_idx;
444 		memcpy(&iobj.id, id, sizeof(iobj.id));
445 		data = &iobj;
446 		len = sizeof(iobj);
447 	} else {
448 		data = id;
449 		len = sizeof(*id);
450 	}
451 
452 	if (imsg_compose(ibuf, GOT_IMSG_TAG_REQUEST, 0, 0, fd, data, len)
453 	    == -1) {
454 		err = got_error_from_errno("imsg_compose TAG_REQUEST");
455 		if (fd != -1)
456 			close(fd);
457 		return err;
458 	}
459 
460 	return flush_imsg(ibuf);
461 }
462 
463 const struct got_error *
464 got_privsep_send_blob_req(struct imsgbuf *ibuf, int infd,
465     struct got_object_id *id, int pack_idx)
466 {
467 	const struct got_error *err = NULL;
468 	struct got_imsg_packed_object iobj;
469 	void *data;
470 	size_t len;
471 
472 	memset(&iobj, 0, sizeof(iobj));
473 	if (pack_idx != -1) { /* blob is packed */
474 		iobj.idx = pack_idx;
475 		memcpy(&iobj.id, id, sizeof(iobj.id));
476 		data = &iobj;
477 		len = sizeof(iobj);
478 	} else {
479 		data = id;
480 		len = sizeof(*id);
481 	}
482 
483 	if (imsg_compose(ibuf, GOT_IMSG_BLOB_REQUEST, 0, 0, infd, data, len)
484 	    == -1) {
485 		err = got_error_from_errno("imsg_compose BLOB_REQUEST");
486 		close(infd);
487 		return err;
488 	}
489 
490 	return flush_imsg(ibuf);
491 }
492 
493 const struct got_error *
494 got_privsep_send_blob_outfd(struct imsgbuf *ibuf, int outfd)
495 {
496 	const struct got_error *err = NULL;
497 
498 	if (imsg_compose(ibuf, GOT_IMSG_BLOB_OUTFD, 0, 0, outfd, NULL, 0)
499 	    == -1) {
500 		err = got_error_from_errno("imsg_compose BLOB_OUTFD");
501 		close(outfd);
502 		return err;
503 	}
504 
505 	return flush_imsg(ibuf);
506 }
507 
508 static const struct got_error *
509 send_fd(struct imsgbuf *ibuf, int imsg_code, int fd)
510 {
511 	const struct got_error *err = NULL;
512 
513 	if (imsg_compose(ibuf, imsg_code, 0, 0, fd, NULL, 0) == -1) {
514 		err = got_error_from_errno("imsg_compose TMPFD");
515 		close(fd);
516 		return err;
517 	}
518 
519 	return flush_imsg(ibuf);
520 }
521 
522 const struct got_error *
523 got_privsep_send_tmpfd(struct imsgbuf *ibuf, int fd)
524 {
525 	return send_fd(ibuf, GOT_IMSG_TMPFD, fd);
526 }
527 
528 const struct got_error *
529 got_privsep_send_obj(struct imsgbuf *ibuf, struct got_object *obj)
530 {
531 	struct got_imsg_object iobj;
532 
533 	memset(&iobj, 0, sizeof(iobj));
534 
535 	memcpy(&iobj.id, &obj->id, sizeof(iobj.id));
536 	iobj.type = obj->type;
537 	iobj.flags = obj->flags;
538 	iobj.hdrlen = obj->hdrlen;
539 	iobj.size = obj->size;
540 	if (iobj.flags & GOT_OBJ_FLAG_PACKED) {
541 		iobj.pack_offset = obj->pack_offset;
542 		iobj.pack_idx = obj->pack_idx;
543 	}
544 
545 	if (imsg_compose(ibuf, GOT_IMSG_OBJECT, 0, 0, -1, &iobj, sizeof(iobj))
546 	    == -1)
547 		return got_error_from_errno("imsg_compose OBJECT");
548 
549 	return flush_imsg(ibuf);
550 }
551 
552 const struct got_error *
553 got_privsep_send_fetch_req(struct imsgbuf *ibuf, int fd,
554     struct got_pathlist_head *have_refs, int fetch_all_branches,
555     struct got_pathlist_head *wanted_branches,
556     struct got_pathlist_head *wanted_refs, int list_refs_only,
557     const char *worktree_branch, const char *remote_head,
558     int no_head, int verbosity)
559 {
560 	const struct got_error *err = NULL;
561 	struct ibuf *wbuf;
562 	struct got_pathlist_entry *pe;
563 	struct got_imsg_fetch_request fetchreq;
564 	size_t remote_head_len, worktree_branch_len, len = sizeof(fetchreq);
565 
566 	if (worktree_branch) {
567 		worktree_branch_len = strlen(worktree_branch);
568 		len += worktree_branch_len;
569 	}
570 	if (remote_head) {
571 		remote_head_len = strlen(remote_head);
572 		len += remote_head_len;
573 	}
574 
575 	if (len >= MAX_IMSGSIZE - IMSG_HEADER_SIZE) {
576 		close(fd);
577 		return got_error(GOT_ERR_NO_SPACE);
578 	}
579 
580 	wbuf = imsg_create(ibuf, GOT_IMSG_FETCH_REQUEST, 0, 0, len);
581 	if (wbuf == NULL) {
582 		err = got_error_from_errno("imsg_create FETCH_HAVE_REF");
583 		close(fd);
584 		return err;
585 	}
586 
587 	memset(&fetchreq, 0, sizeof(fetchreq));
588 	fetchreq.no_head = no_head;
589 	fetchreq.fetch_all_branches = fetch_all_branches;
590 	fetchreq.list_refs_only = list_refs_only;
591 	fetchreq.verbosity = verbosity;
592 	if (worktree_branch != NULL)
593 		fetchreq.worktree_branch_len = worktree_branch_len;
594 	if (remote_head != NULL)
595 		fetchreq.remote_head_len = remote_head_len;
596 	TAILQ_FOREACH(pe, have_refs, entry)
597 		fetchreq.n_have_refs++;
598 	TAILQ_FOREACH(pe, wanted_branches, entry)
599 		fetchreq.n_wanted_branches++;
600 	TAILQ_FOREACH(pe, wanted_refs, entry)
601 		fetchreq.n_wanted_refs++;
602 	if (imsg_add(wbuf, &fetchreq, sizeof(fetchreq)) == -1)
603 		return got_error_from_errno("imsg_add FETCH_REQUEST");
604 	if (worktree_branch) {
605 		if (imsg_add(wbuf, worktree_branch, worktree_branch_len)
606 		    == -1) {
607 			err = got_error_from_errno("imsg_add FETCH_REQUEST");
608 			close(fd);
609 			return err;
610 		}
611 	}
612 	if (remote_head) {
613 		if (imsg_add(wbuf, remote_head, remote_head_len) == -1) {
614 			err = got_error_from_errno("imsg_add FETCH_REQUEST");
615 			close(fd);
616 			return err;
617 		}
618 	}
619 	ibuf_fd_set(wbuf, fd);
620 	fd = -1;
621 	imsg_close(ibuf, wbuf);
622 
623 	err = flush_imsg(ibuf);
624 	if (err)
625 		return err;
626 
627 	TAILQ_FOREACH(pe, have_refs, entry) {
628 		const char *name = pe->path;
629 		size_t name_len = pe->path_len;
630 		struct got_object_id *id = pe->data;
631 
632 		len = sizeof(struct got_imsg_fetch_have_ref) + name_len;
633 		wbuf = imsg_create(ibuf, GOT_IMSG_FETCH_HAVE_REF, 0, 0, len);
634 		if (wbuf == NULL)
635 			return got_error_from_errno("imsg_create FETCH_HAVE_REF");
636 
637 		/* Keep in sync with struct got_imsg_fetch_have_ref! */
638 		if (imsg_add(wbuf, id, sizeof(*id)) == -1)
639 			return got_error_from_errno("imsg_add FETCH_HAVE_REF");
640 		if (imsg_add(wbuf, &name_len, sizeof(name_len)) == -1)
641 			return got_error_from_errno("imsg_add FETCH_HAVE_REF");
642 		if (imsg_add(wbuf, name, name_len) == -1)
643 			return got_error_from_errno("imsg_add FETCH_HAVE_REF");
644 
645 		imsg_close(ibuf, wbuf);
646 		err = flush_imsg(ibuf);
647 		if (err)
648 			return err;
649 	}
650 
651 	TAILQ_FOREACH(pe, wanted_branches, entry) {
652 		const char *name = pe->path;
653 		size_t name_len = pe->path_len;
654 
655 		len = sizeof(struct got_imsg_fetch_wanted_branch) + name_len;
656 		wbuf = imsg_create(ibuf, GOT_IMSG_FETCH_WANTED_BRANCH, 0, 0,
657 		    len);
658 		if (wbuf == NULL)
659 			return got_error_from_errno(
660 			    "imsg_create FETCH_WANTED_BRANCH");
661 
662 		/* Keep in sync with struct got_imsg_fetch_wanted_branch! */
663 		if (imsg_add(wbuf, &name_len, sizeof(name_len)) == -1)
664 			return got_error_from_errno(
665 			    "imsg_add FETCH_WANTED_BRANCH");
666 		if (imsg_add(wbuf, name, name_len) == -1)
667 			return got_error_from_errno(
668 			    "imsg_add FETCH_WANTED_BRANCH");
669 
670 		imsg_close(ibuf, wbuf);
671 		err = flush_imsg(ibuf);
672 		if (err)
673 			return err;
674 	}
675 
676 	TAILQ_FOREACH(pe, wanted_refs, entry) {
677 		const char *name = pe->path;
678 		size_t name_len = pe->path_len;
679 
680 		len = sizeof(struct got_imsg_fetch_wanted_ref) + name_len;
681 		wbuf = imsg_create(ibuf, GOT_IMSG_FETCH_WANTED_REF, 0, 0,
682 		    len);
683 		if (wbuf == NULL)
684 			return got_error_from_errno(
685 			    "imsg_create FETCH_WANTED_REF");
686 
687 		/* Keep in sync with struct got_imsg_fetch_wanted_ref! */
688 		if (imsg_add(wbuf, &name_len, sizeof(name_len)) == -1)
689 			return got_error_from_errno(
690 			    "imsg_add FETCH_WANTED_REF");
691 		if (imsg_add(wbuf, name, name_len) == -1)
692 			return got_error_from_errno(
693 			    "imsg_add FETCH_WANTED_REF");
694 
695 		imsg_close(ibuf, wbuf);
696 		err = flush_imsg(ibuf);
697 		if (err)
698 			return err;
699 	}
700 
701 	return NULL;
702 }
703 
704 const struct got_error *
705 got_privsep_send_fetch_outfd(struct imsgbuf *ibuf, int fd)
706 {
707 	return send_fd(ibuf, GOT_IMSG_FETCH_OUTFD, fd);
708 }
709 
710 const struct got_error *
711 got_privsep_recv_fetch_progress(int *done, struct got_object_id **id,
712     char **refname, struct got_pathlist_head *symrefs, char **server_progress,
713     off_t *packfile_size, uint8_t *pack_sha1, struct imsgbuf *ibuf)
714 {
715 	const struct got_error *err = NULL;
716 	struct imsg imsg;
717 	size_t datalen;
718 	struct got_imsg_fetch_symrefs *isymrefs = NULL;
719 	size_t n, remain;
720 	off_t off;
721 	int i;
722 
723 	*done = 0;
724 	*id = NULL;
725 	*refname = NULL;
726 	*server_progress = NULL;
727 	*packfile_size = 0;
728 	memset(pack_sha1, 0, SHA1_DIGEST_LENGTH);
729 
730 	err = got_privsep_recv_imsg(&imsg, ibuf, 0);
731 	if (err)
732 		return err;
733 
734 	datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
735 	switch (imsg.hdr.type) {
736 	case GOT_IMSG_FETCH_SYMREFS:
737 		if (datalen < sizeof(*isymrefs)) {
738 			err = got_error(GOT_ERR_PRIVSEP_LEN);
739 			break;
740 		}
741 		if (isymrefs != NULL) {
742 			err = got_error(GOT_ERR_PRIVSEP_MSG);
743 			break;
744 		}
745 		isymrefs = (struct got_imsg_fetch_symrefs *)imsg.data;
746 		off = sizeof(*isymrefs);
747 		remain = datalen - off;
748 		for (n = 0; n < isymrefs->nsymrefs; n++) {
749 			struct got_imsg_fetch_symref *s;
750 			char *name, *target;
751 			if (remain < sizeof(struct got_imsg_fetch_symref)) {
752 				err = got_error(GOT_ERR_PRIVSEP_LEN);
753 				goto done;
754 			}
755 			s = (struct got_imsg_fetch_symref *)(imsg.data + off);
756 			off += sizeof(*s);
757 			remain -= sizeof(*s);
758 			if (remain < s->name_len) {
759 				err = got_error(GOT_ERR_PRIVSEP_LEN);
760 				goto done;
761 			}
762 			name = strndup(imsg.data + off, s->name_len);
763 			if (name == NULL) {
764 				err = got_error_from_errno("strndup");
765 				goto done;
766 			}
767 			off += s->name_len;
768 			remain -= s->name_len;
769 			if (remain < s->target_len) {
770 				err = got_error(GOT_ERR_PRIVSEP_LEN);
771 				free(name);
772 				goto done;
773 			}
774 			target = strndup(imsg.data + off, s->target_len);
775 			if (target == NULL) {
776 				err = got_error_from_errno("strndup");
777 				free(name);
778 				goto done;
779 			}
780 			off += s->target_len;
781 			remain -= s->target_len;
782 			err = got_pathlist_append(symrefs, name, target);
783 			if (err) {
784 				free(name);
785 				free(target);
786 				goto done;
787 			}
788 		}
789 		break;
790 	case GOT_IMSG_FETCH_REF:
791 		if (datalen <= sizeof(**id)) {
792 			err = got_error(GOT_ERR_PRIVSEP_MSG);
793 			break;
794 		}
795 		*id = malloc(sizeof(**id));
796 		if (*id == NULL) {
797 			err = got_error_from_errno("malloc");
798 			break;
799 		}
800 		memcpy(*id, imsg.data, sizeof(**id));
801 		*refname = strndup(imsg.data + sizeof(**id),
802 		    datalen - sizeof(**id));
803 		if (*refname == NULL) {
804 			err = got_error_from_errno("strndup");
805 			break;
806 		}
807 		break;
808 	case GOT_IMSG_FETCH_SERVER_PROGRESS:
809 		if (datalen == 0) {
810 			err = got_error(GOT_ERR_PRIVSEP_LEN);
811 			break;
812 		}
813 		*server_progress = strndup(imsg.data, datalen);
814 		if (*server_progress == NULL) {
815 			err = got_error_from_errno("strndup");
816 			break;
817 		}
818 		for (i = 0; i < datalen; i++) {
819 			if (!isprint((unsigned char)(*server_progress)[i]) &&
820 			    !isspace((unsigned char)(*server_progress)[i])) {
821 				err = got_error(GOT_ERR_PRIVSEP_MSG);
822 				free(*server_progress);
823 				*server_progress = NULL;
824 				goto done;
825 			}
826 		}
827 		break;
828 	case GOT_IMSG_FETCH_DOWNLOAD_PROGRESS:
829 		if (datalen < sizeof(*packfile_size)) {
830 			err = got_error(GOT_ERR_PRIVSEP_MSG);
831 			break;
832 		}
833 		memcpy(packfile_size, imsg.data, sizeof(*packfile_size));
834 		break;
835 	case GOT_IMSG_FETCH_DONE:
836 		if (datalen != SHA1_DIGEST_LENGTH) {
837 			err = got_error(GOT_ERR_PRIVSEP_MSG);
838 			break;
839 		}
840 		memcpy(pack_sha1, imsg.data, SHA1_DIGEST_LENGTH);
841 		*done = 1;
842 		break;
843 	default:
844 		err = got_error(GOT_ERR_PRIVSEP_MSG);
845 		break;
846 	}
847 done:
848 	if (err) {
849 		free(*id);
850 		*id = NULL;
851 		free(*refname);
852 		*refname = NULL;
853 	}
854 	imsg_free(&imsg);
855 	return err;
856 }
857 
858 static const struct got_error *
859 send_send_ref(const char *name, size_t name_len, struct got_object_id *id,
860     int delete, struct imsgbuf *ibuf)
861 {
862 	size_t len;
863 	struct ibuf *wbuf;
864 
865 	len = sizeof(struct got_imsg_send_ref) + name_len;
866 	wbuf = imsg_create(ibuf, GOT_IMSG_SEND_REF, 0, 0, len);
867 	if (wbuf == NULL)
868 		return got_error_from_errno("imsg_create SEND_REF");
869 
870 	/* Keep in sync with struct got_imsg_send_ref! */
871 	if (imsg_add(wbuf, id, sizeof(*id)) == -1)
872 		return got_error_from_errno("imsg_add SEND_REF");
873 	if (imsg_add(wbuf, &delete, sizeof(delete)) == -1)
874 		return got_error_from_errno("imsg_add SEND_REF");
875 	if (imsg_add(wbuf, &name_len, sizeof(name_len)) == -1)
876 		return got_error_from_errno("imsg_add SEND_REF");
877 	if (imsg_add(wbuf, name, name_len) == -1)
878 		return got_error_from_errno("imsg_add SEND_REF");
879 
880 	imsg_close(ibuf, wbuf);
881 	return flush_imsg(ibuf);
882 }
883 
884 const struct got_error *
885 got_privsep_send_send_req(struct imsgbuf *ibuf, int fd,
886     struct got_pathlist_head *have_refs,
887     struct got_pathlist_head *delete_refs,
888     int verbosity)
889 {
890 	const struct got_error *err = NULL;
891 	struct got_pathlist_entry *pe;
892 	struct got_imsg_send_request sendreq;
893 	struct got_object_id zero_id;
894 
895 	memset(&zero_id, 0, sizeof(zero_id));
896 	memset(&sendreq, 0, sizeof(sendreq));
897 	sendreq.verbosity = verbosity;
898 	TAILQ_FOREACH(pe, have_refs, entry)
899 		sendreq.nrefs++;
900 	TAILQ_FOREACH(pe, delete_refs, entry)
901 		sendreq.nrefs++;
902 	if (imsg_compose(ibuf, GOT_IMSG_SEND_REQUEST, 0, 0, fd,
903 	    &sendreq, sizeof(sendreq)) == -1) {
904 		err = got_error_from_errno(
905 		    "imsg_compose FETCH_SERVER_PROGRESS");
906 		goto done;
907 	}
908 
909 	fd = -1;
910 	err = flush_imsg(ibuf);
911 	if (err)
912 		goto done;
913 
914 	TAILQ_FOREACH(pe, have_refs, entry) {
915 		const char *name = pe->path;
916 		size_t name_len = pe->path_len;
917 		struct got_object_id *id = pe->data;
918 		err = send_send_ref(name, name_len, id, 0, ibuf);
919 		if (err)
920 			goto done;
921 	}
922 
923 	TAILQ_FOREACH(pe, delete_refs, entry) {
924 		const char *name = pe->path;
925 		size_t name_len = pe->path_len;
926 		err = send_send_ref(name, name_len, &zero_id, 1, ibuf);
927 		if (err)
928 			goto done;
929 	}
930 done:
931 	if (fd != -1 && close(fd) == -1 && err == NULL)
932 		err = got_error_from_errno("close");
933 	return err;
934 }
935 
936 const struct got_error *
937 got_privsep_recv_send_remote_refs(struct got_pathlist_head *remote_refs,
938     struct imsgbuf *ibuf)
939 {
940 	const struct got_error *err = NULL;
941 	struct imsg imsg;
942 	size_t datalen;
943 	int done = 0;
944 	struct got_imsg_send_remote_ref iremote_ref;
945 	struct got_object_id *id = NULL;
946 	char *refname = NULL;
947 	struct got_pathlist_entry *new;
948 
949 	while (!done) {
950 		err = got_privsep_recv_imsg(&imsg, ibuf, 0);
951 		if (err)
952 			return err;
953 		datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
954 		switch (imsg.hdr.type) {
955 		case GOT_IMSG_SEND_REMOTE_REF:
956 			if (datalen < sizeof(iremote_ref)) {
957 				err = got_error(GOT_ERR_PRIVSEP_MSG);
958 				goto done;
959 			}
960 			memcpy(&iremote_ref, imsg.data, sizeof(iremote_ref));
961 			if (datalen != sizeof(iremote_ref) +
962 			    iremote_ref.name_len) {
963 				err = got_error(GOT_ERR_PRIVSEP_MSG);
964 				goto done;
965 			}
966 			id = malloc(sizeof(*id));
967 			if (id == NULL) {
968 				err = got_error_from_errno("malloc");
969 				goto done;
970 			}
971 			memcpy(id, &iremote_ref.id, sizeof(*id));
972 			refname = strndup(imsg.data + sizeof(iremote_ref),
973 			    datalen - sizeof(iremote_ref));
974 			if (refname == NULL) {
975 				err = got_error_from_errno("strndup");
976 				goto done;
977 			}
978 			err = got_pathlist_insert(&new, remote_refs,
979 			    refname, id);
980 			if (err)
981 				goto done;
982 			if (new == NULL) { /* duplicate which wasn't inserted */
983 				free(id);
984 				free(refname);
985 			}
986 			id = NULL;
987 			refname = NULL;
988 			break;
989 		case GOT_IMSG_SEND_PACK_REQUEST:
990 			if (datalen != 0) {
991 				err = got_error(GOT_ERR_PRIVSEP_MSG);
992 				goto done;
993 			}
994 			/* got-send-pack is now waiting for a pack file. */
995 			done = 1;
996 			break;
997 		default:
998 			err = got_error(GOT_ERR_PRIVSEP_MSG);
999 			break;
1000 		}
1001 	}
1002 done:
1003 	free(id);
1004 	free(refname);
1005 	imsg_free(&imsg);
1006 	return err;
1007 }
1008 
1009 const struct got_error *
1010 got_privsep_send_packfd(struct imsgbuf *ibuf, int fd)
1011 {
1012 	return send_fd(ibuf, GOT_IMSG_SEND_PACKFD, fd);
1013 }
1014 
1015 const struct got_error *
1016 got_privsep_recv_send_progress(int *done, off_t *bytes_sent,
1017     int *success, char **refname, char **errmsg, struct imsgbuf *ibuf)
1018 {
1019 	const struct got_error *err = NULL;
1020 	struct imsg imsg;
1021 	size_t datalen;
1022 	struct got_imsg_send_ref_status iref_status;
1023 
1024 	/* Do not reset the current value of 'bytes_sent', it accumulates. */
1025 	*done = 0;
1026 	*success = 0;
1027 	*refname = NULL;
1028 	*errmsg = NULL;
1029 
1030 	err = got_privsep_recv_imsg(&imsg, ibuf, 0);
1031 	if (err)
1032 		return err;
1033 
1034 	datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
1035 	switch (imsg.hdr.type) {
1036 	case GOT_IMSG_SEND_UPLOAD_PROGRESS:
1037 		if (datalen < sizeof(*bytes_sent)) {
1038 			err = got_error(GOT_ERR_PRIVSEP_MSG);
1039 			break;
1040 		}
1041 		memcpy(bytes_sent, imsg.data, sizeof(*bytes_sent));
1042 		break;
1043 	case GOT_IMSG_SEND_REF_STATUS:
1044 		if (datalen < sizeof(iref_status)) {
1045 			err = got_error(GOT_ERR_PRIVSEP_MSG);
1046 			break;
1047 		}
1048 		memcpy(&iref_status, imsg.data, sizeof(iref_status));
1049 		if (datalen != sizeof(iref_status) + iref_status.name_len +
1050 		    iref_status.errmsg_len) {
1051 			err = got_error(GOT_ERR_PRIVSEP_MSG);
1052 			break;
1053 		}
1054 		*success = iref_status.success;
1055 		*refname = strndup(imsg.data + sizeof(iref_status),
1056 		    iref_status.name_len);
1057 
1058 		if (iref_status.errmsg_len != 0)
1059 			*errmsg = strndup(imsg.data + sizeof(iref_status) +
1060 			    iref_status.name_len, iref_status.errmsg_len);
1061 		break;
1062 	case GOT_IMSG_SEND_DONE:
1063 		if (datalen != 0) {
1064 			err = got_error(GOT_ERR_PRIVSEP_MSG);
1065 			break;
1066 		}
1067 		*done = 1;
1068 		break;
1069 	default:
1070 		err = got_error(GOT_ERR_PRIVSEP_MSG);
1071 		break;
1072 	}
1073 
1074 	imsg_free(&imsg);
1075 	return err;
1076 }
1077 
1078 const struct got_error *
1079 got_privsep_send_index_pack_req(struct imsgbuf *ibuf, uint8_t *pack_sha1,
1080     int fd)
1081 {
1082 	const struct got_error *err = NULL;
1083 
1084 	/* Keep in sync with struct got_imsg_index_pack_request */
1085 	if (imsg_compose(ibuf, GOT_IMSG_IDXPACK_REQUEST, 0, 0, fd,
1086 	    pack_sha1, SHA1_DIGEST_LENGTH) == -1) {
1087 		err = got_error_from_errno("imsg_compose INDEX_REQUEST");
1088 		close(fd);
1089 		return err;
1090 	}
1091 	return flush_imsg(ibuf);
1092 }
1093 
1094 const struct got_error *
1095 got_privsep_send_index_pack_outfd(struct imsgbuf *ibuf, int fd)
1096 {
1097 	return send_fd(ibuf, GOT_IMSG_IDXPACK_OUTFD, fd);
1098 }
1099 
1100 const struct got_error *
1101 got_privsep_recv_index_progress(int *done, int *nobj_total,
1102     int *nobj_indexed, int *nobj_loose, int *nobj_resolved,
1103     struct imsgbuf *ibuf)
1104 {
1105 	const struct got_error *err = NULL;
1106 	struct imsg imsg;
1107 	struct got_imsg_index_pack_progress *iprogress;
1108 	size_t datalen;
1109 
1110 	*done = 0;
1111 	*nobj_total = 0;
1112 	*nobj_indexed = 0;
1113 	*nobj_resolved = 0;
1114 
1115 	err = got_privsep_recv_imsg(&imsg, ibuf, 0);
1116 	if (err)
1117 		return err;
1118 
1119 	datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
1120 	switch (imsg.hdr.type) {
1121 	case GOT_IMSG_IDXPACK_PROGRESS:
1122 		if (datalen < sizeof(*iprogress)) {
1123 			err = got_error(GOT_ERR_PRIVSEP_LEN);
1124 			break;
1125 		}
1126 		iprogress = (struct got_imsg_index_pack_progress *)imsg.data;
1127 		if (iprogress->nobj_total < 0 || iprogress->nobj_indexed < 0 ||
1128 		    iprogress->nobj_loose < 0 || iprogress->nobj_resolved < 0) {
1129 			err = got_error(GOT_ERR_RANGE);
1130 			break;
1131 		}
1132 		*nobj_total = iprogress->nobj_total;
1133 		*nobj_indexed = iprogress->nobj_indexed;
1134 		*nobj_loose = iprogress->nobj_loose;
1135 		*nobj_resolved = iprogress->nobj_resolved;
1136 		break;
1137 	case GOT_IMSG_IDXPACK_DONE:
1138 		if (datalen != 0) {
1139 			err = got_error(GOT_ERR_PRIVSEP_LEN);
1140 			break;
1141 		}
1142 		*done = 1;
1143 		break;
1144 	default:
1145 		err = got_error(GOT_ERR_PRIVSEP_MSG);
1146 		break;
1147 	}
1148 
1149 	imsg_free(&imsg);
1150 	return err;
1151 }
1152 
1153 const struct got_error *
1154 got_privsep_get_imsg_obj(struct got_object **obj, struct imsg *imsg,
1155     struct imsgbuf *ibuf)
1156 {
1157 	struct got_imsg_object *iobj;
1158 	size_t datalen = imsg->hdr.len - IMSG_HEADER_SIZE;
1159 
1160 	if (datalen != sizeof(*iobj))
1161 		return got_error(GOT_ERR_PRIVSEP_LEN);
1162 	iobj = imsg->data;
1163 
1164 	if (iobj->pack_offset < 0)
1165 		return got_error(GOT_ERR_PACK_OFFSET);
1166 
1167 	*obj = calloc(1, sizeof(**obj));
1168 	if (*obj == NULL)
1169 		return got_error_from_errno("calloc");
1170 
1171 	memcpy(&(*obj)->id, &iobj->id, sizeof(iobj->id));
1172 	(*obj)->type = iobj->type;
1173 	(*obj)->flags = iobj->flags;
1174 	(*obj)->hdrlen = iobj->hdrlen;
1175 	(*obj)->size = iobj->size;
1176 	/* path_packfile is handled by caller */
1177 	if (iobj->flags & GOT_OBJ_FLAG_PACKED) {
1178 		(*obj)->pack_offset = iobj->pack_offset;
1179 		(*obj)->pack_idx = iobj->pack_idx;
1180 	}
1181 	STAILQ_INIT(&(*obj)->deltas.entries);
1182 	return NULL;
1183 }
1184 
1185 const struct got_error *
1186 got_privsep_recv_obj(struct got_object **obj, struct imsgbuf *ibuf)
1187 {
1188 	const struct got_error *err = NULL;
1189 	struct imsg imsg;
1190 	const size_t min_datalen = sizeof(struct got_imsg_object);
1191 
1192 	*obj = NULL;
1193 
1194 	err = got_privsep_recv_imsg(&imsg, ibuf, min_datalen);
1195 	if (err)
1196 		return err;
1197 
1198 	switch (imsg.hdr.type) {
1199 	case GOT_IMSG_OBJECT:
1200 		err = got_privsep_get_imsg_obj(obj, &imsg, ibuf);
1201 		break;
1202 	default:
1203 		err = got_error(GOT_ERR_PRIVSEP_MSG);
1204 		break;
1205 	}
1206 
1207 	imsg_free(&imsg);
1208 
1209 	return err;
1210 }
1211 
1212 static const struct got_error *
1213 send_commit_logmsg(struct imsgbuf *ibuf, struct got_commit_object *commit,
1214     size_t logmsg_len)
1215 {
1216 	const struct got_error *err = NULL;
1217 	size_t offset, remain;
1218 
1219 	offset = 0;
1220 	remain = logmsg_len;
1221 	while (remain > 0) {
1222 		size_t n = MIN(MAX_IMSGSIZE - IMSG_HEADER_SIZE, remain);
1223 
1224 		if (imsg_compose(ibuf, GOT_IMSG_COMMIT_LOGMSG, 0, 0, -1,
1225 		    commit->logmsg + offset, n) == -1) {
1226 			err = got_error_from_errno("imsg_compose "
1227 			    "COMMIT_LOGMSG");
1228 			break;
1229 		}
1230 
1231 		err = flush_imsg(ibuf);
1232 		if (err)
1233 			break;
1234 
1235 		offset += n;
1236 		remain -= n;
1237 	}
1238 
1239 	return err;
1240 }
1241 
1242 const struct got_error *
1243 got_privsep_send_commit(struct imsgbuf *ibuf, struct got_commit_object *commit)
1244 {
1245 	const struct got_error *err = NULL;
1246 	struct got_imsg_commit_object *icommit;
1247 	uint8_t *buf;
1248 	size_t len, total;
1249 	struct got_object_qid *qid;
1250 	size_t author_len = strlen(commit->author);
1251 	size_t committer_len = strlen(commit->committer);
1252 	size_t logmsg_len = strlen(commit->logmsg);
1253 
1254 	total = sizeof(*icommit) + author_len + committer_len +
1255 	    commit->nparents * sizeof(struct got_object_id);
1256 
1257 	buf = malloc(total);
1258 	if (buf == NULL)
1259 		return got_error_from_errno("malloc");
1260 
1261 	icommit = (struct got_imsg_commit_object *)buf;
1262 	memcpy(&icommit->tree_id, commit->tree_id, sizeof(icommit->tree_id));
1263 	icommit->author_len = author_len;
1264 	icommit->author_time = commit->author_time;
1265 	icommit->author_gmtoff = commit->author_gmtoff;
1266 	icommit->committer_len = committer_len;
1267 	icommit->committer_time = commit->committer_time;
1268 	icommit->committer_gmtoff = commit->committer_gmtoff;
1269 	icommit->logmsg_len = logmsg_len;
1270 	icommit->nparents = commit->nparents;
1271 
1272 	len = sizeof(*icommit);
1273 	memcpy(buf + len, commit->author, author_len);
1274 	len += author_len;
1275 	memcpy(buf + len, commit->committer, committer_len);
1276 	len += committer_len;
1277 	STAILQ_FOREACH(qid, &commit->parent_ids, entry) {
1278 		memcpy(buf + len, &qid->id, sizeof(qid->id));
1279 		len += sizeof(qid->id);
1280 	}
1281 
1282 	if (imsg_compose(ibuf, GOT_IMSG_COMMIT, 0, 0, -1, buf, len) == -1) {
1283 		err = got_error_from_errno("imsg_compose COMMIT");
1284 		goto done;
1285 	}
1286 
1287 	if (logmsg_len == 0 ||
1288 	    logmsg_len + len > MAX_IMSGSIZE - IMSG_HEADER_SIZE) {
1289 		err = flush_imsg(ibuf);
1290 		if (err)
1291 			goto done;
1292 	}
1293 	err = send_commit_logmsg(ibuf, commit, logmsg_len);
1294 done:
1295 	free(buf);
1296 	return err;
1297 }
1298 
1299 static const struct got_error *
1300 get_commit_from_imsg(struct got_commit_object **commit,
1301     struct imsg *imsg, size_t datalen, struct imsgbuf *ibuf)
1302 {
1303 	const struct got_error *err = NULL;
1304 	struct got_imsg_commit_object *icommit;
1305 	size_t len = 0;
1306 	int i;
1307 
1308 	if (datalen < sizeof(*icommit))
1309 		return got_error(GOT_ERR_PRIVSEP_LEN);
1310 
1311 	icommit = imsg->data;
1312 	if (datalen != sizeof(*icommit) + icommit->author_len +
1313 	    icommit->committer_len +
1314 	    icommit->nparents * sizeof(struct got_object_id))
1315 		return got_error(GOT_ERR_PRIVSEP_LEN);
1316 
1317 	if (icommit->nparents < 0)
1318 		return got_error(GOT_ERR_PRIVSEP_LEN);
1319 
1320 	len += sizeof(*icommit);
1321 
1322 	*commit = got_object_commit_alloc_partial();
1323 	if (*commit == NULL)
1324 		return got_error_from_errno(
1325 		    "got_object_commit_alloc_partial");
1326 
1327 	memcpy((*commit)->tree_id, &icommit->tree_id,
1328 	    sizeof(icommit->tree_id));
1329 	(*commit)->author_time = icommit->author_time;
1330 	(*commit)->author_gmtoff = icommit->author_gmtoff;
1331 	(*commit)->committer_time = icommit->committer_time;
1332 	(*commit)->committer_gmtoff = icommit->committer_gmtoff;
1333 
1334 	(*commit)->author = strndup(imsg->data + len, icommit->author_len);
1335 	if ((*commit)->author == NULL) {
1336 		err = got_error_from_errno("strndup");
1337 		goto done;
1338 	}
1339 	len += icommit->author_len;
1340 
1341 	(*commit)->committer = strndup(imsg->data + len,
1342 	    icommit->committer_len);
1343 	if ((*commit)->committer == NULL) {
1344 		err = got_error_from_errno("strndup");
1345 		goto done;
1346 	}
1347 	len += icommit->committer_len;
1348 
1349 	if (icommit->logmsg_len == 0) {
1350 		(*commit)->logmsg = strdup("");
1351 		if ((*commit)->logmsg == NULL) {
1352 			err = got_error_from_errno("strdup");
1353 			goto done;
1354 		}
1355 	} else {
1356 		size_t offset = 0, remain = icommit->logmsg_len;
1357 
1358 		(*commit)->logmsg = malloc(icommit->logmsg_len + 1);
1359 		if ((*commit)->logmsg == NULL) {
1360 			err = got_error_from_errno("malloc");
1361 			goto done;
1362 		}
1363 		while (remain > 0) {
1364 			struct imsg imsg_log;
1365 			size_t n = MIN(MAX_IMSGSIZE - IMSG_HEADER_SIZE,
1366 			    remain);
1367 
1368 			err = got_privsep_recv_imsg(&imsg_log, ibuf, n);
1369 			if (err)
1370 				goto done;
1371 
1372 			if (imsg_log.hdr.type != GOT_IMSG_COMMIT_LOGMSG) {
1373 				err = got_error(GOT_ERR_PRIVSEP_MSG);
1374 				goto done;
1375 			}
1376 
1377 			memcpy((*commit)->logmsg + offset,
1378 			    imsg_log.data, n);
1379 			imsg_free(&imsg_log);
1380 			offset += n;
1381 			remain -= n;
1382 		}
1383 		(*commit)->logmsg[icommit->logmsg_len] = '\0';
1384 	}
1385 
1386 	for (i = 0; i < icommit->nparents; i++) {
1387 		struct got_object_qid *qid;
1388 
1389 		err = got_object_qid_alloc_partial(&qid);
1390 		if (err)
1391 			break;
1392 		memcpy(&qid->id, imsg->data + len +
1393 		    i * sizeof(qid->id), sizeof(qid->id));
1394 		STAILQ_INSERT_TAIL(&(*commit)->parent_ids, qid, entry);
1395 		(*commit)->nparents++;
1396 	}
1397 done:
1398 	if (err) {
1399 		got_object_commit_close(*commit);
1400 		*commit = NULL;
1401 	}
1402 	return err;
1403 }
1404 
1405 const struct got_error *
1406 got_privsep_recv_commit(struct got_commit_object **commit, struct imsgbuf *ibuf)
1407 {
1408 	const struct got_error *err = NULL;
1409 	struct imsg imsg;
1410 	size_t datalen;
1411 	const size_t min_datalen = sizeof(struct got_imsg_commit_object);
1412 
1413 	*commit = NULL;
1414 
1415 	err = got_privsep_recv_imsg(&imsg, ibuf, min_datalen);
1416 	if (err)
1417 		return err;
1418 
1419 	datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
1420 
1421 	switch (imsg.hdr.type) {
1422 	case GOT_IMSG_COMMIT:
1423 		err = get_commit_from_imsg(commit, &imsg, datalen, ibuf);
1424 		break;
1425 	default:
1426 		err = got_error(GOT_ERR_PRIVSEP_MSG);
1427 		break;
1428 	}
1429 
1430 	imsg_free(&imsg);
1431 
1432 	return err;
1433 }
1434 
1435 static const struct got_error *
1436 send_tree_entries_batch(struct imsgbuf *ibuf,
1437     struct got_parsed_tree_entry *entries, int idx0, int idxN, size_t len)
1438 {
1439 	struct ibuf *wbuf;
1440 	struct got_imsg_tree_entries ientries;
1441 	int i;
1442 
1443 	memset(&ientries, 0, sizeof(ientries));
1444 
1445 	wbuf = imsg_create(ibuf, GOT_IMSG_TREE_ENTRIES, 0, 0, len);
1446 	if (wbuf == NULL)
1447 		return got_error_from_errno("imsg_create TREE_ENTRY");
1448 
1449 	ientries.nentries = idxN - idx0 + 1;
1450 	if (imsg_add(wbuf, &ientries, sizeof(ientries)) == -1)
1451 		return got_error_from_errno("imsg_add TREE_ENTRY");
1452 
1453 	for (i = idx0; i <= idxN; i++) {
1454 		struct got_parsed_tree_entry *pte = &entries[i];
1455 
1456 		/* Keep in sync with struct got_imsg_tree_entry definition! */
1457 		if (imsg_add(wbuf, pte->id, SHA1_DIGEST_LENGTH) == -1)
1458 			return got_error_from_errno("imsg_add TREE_ENTRY");
1459 		if (imsg_add(wbuf, &pte->mode, sizeof(pte->mode)) == -1)
1460 			return got_error_from_errno("imsg_add TREE_ENTRY");
1461 		if (imsg_add(wbuf, &pte->namelen, sizeof(pte->namelen)) == -1)
1462 			return got_error_from_errno("imsg_add TREE_ENTRY");
1463 
1464 		/* Remaining bytes are the entry's name. */
1465 		if (imsg_add(wbuf, pte->name, pte->namelen) == -1)
1466 			return got_error_from_errno("imsg_add TREE_ENTRY");
1467 	}
1468 
1469 	imsg_close(ibuf, wbuf);
1470 	return NULL;
1471 }
1472 
1473 static const struct got_error *
1474 send_tree_entries(struct imsgbuf *ibuf, struct got_parsed_tree_entry *entries,
1475     int nentries)
1476 {
1477 	const struct got_error *err = NULL;
1478 	int i, j;
1479 	size_t entries_len = sizeof(struct got_imsg_tree_entries);
1480 
1481 	i = 0;
1482 	for (j = 0; j < nentries; j++) {
1483 		struct got_parsed_tree_entry *pte = &entries[j];
1484 		size_t len = sizeof(struct got_imsg_tree_entry) + pte->namelen;
1485 
1486 		if (j > 0 &&
1487 		    entries_len + len > MAX_IMSGSIZE - IMSG_HEADER_SIZE) {
1488 			err = send_tree_entries_batch(ibuf, entries,
1489 			    i, j - 1, entries_len);
1490 			if (err)
1491 				return err;
1492 			i = j;
1493 			entries_len = sizeof(struct got_imsg_tree_entries);
1494 		}
1495 
1496 		entries_len += len;
1497 	}
1498 
1499 	if (j > 0) {
1500 		err = send_tree_entries_batch(ibuf, entries, i, j - 1,
1501 		    entries_len);
1502 		if (err)
1503 			return err;
1504 	}
1505 
1506 	return NULL;
1507 }
1508 
1509 const struct got_error *
1510 got_privsep_send_tree(struct imsgbuf *ibuf,
1511     struct got_parsed_tree_entry *entries, int nentries)
1512 {
1513 	const struct got_error *err = NULL;
1514 	struct got_imsg_tree_object itree;
1515 
1516 	memset(&itree, 0, sizeof(itree));
1517 	itree.nentries = nentries;
1518 	if (imsg_compose(ibuf, GOT_IMSG_TREE, 0, 0, -1, &itree, sizeof(itree))
1519 	    == -1)
1520 		return got_error_from_errno("imsg_compose TREE");
1521 
1522 	err = send_tree_entries(ibuf, entries, nentries);
1523 	if (err)
1524 		return err;
1525 
1526 	return flush_imsg(ibuf);
1527 }
1528 
1529 
1530 static const struct got_error *
1531 recv_tree_entries(void *data, size_t datalen, struct got_tree_object *tree,
1532     int *nentries)
1533 {
1534 	const struct got_error *err = NULL;
1535 	struct got_imsg_tree_entries *ientries;
1536 	struct got_tree_entry *te;
1537 	size_t te_offset;
1538 	size_t i;
1539 
1540 	if (datalen <= sizeof(*ientries) ||
1541 	    datalen > MAX_IMSGSIZE - IMSG_HEADER_SIZE)
1542 		return got_error(GOT_ERR_PRIVSEP_LEN);
1543 
1544 	ientries = (struct got_imsg_tree_entries *)data;
1545 	if (ientries->nentries > INT_MAX) {
1546 		return got_error_msg(GOT_ERR_NO_SPACE,
1547 		    "too many tree entries");
1548 	}
1549 
1550 	te_offset = sizeof(*ientries);
1551 	for (i = 0; i < ientries->nentries; i++) {
1552 		struct got_imsg_tree_entry ite;
1553 		const char *te_name;
1554 		uint8_t *buf = (uint8_t *)data + te_offset;
1555 
1556 		if (te_offset >= datalen) {
1557 			err = got_error(GOT_ERR_PRIVSEP_LEN);
1558 			break;
1559 		}
1560 
1561 		/* Might not be aligned, size is ~32 bytes. */
1562 		memcpy(&ite, buf, sizeof(ite));
1563 
1564 		if (ite.namelen >= sizeof(te->name)) {
1565 			err = got_error(GOT_ERR_PRIVSEP_LEN);
1566 			break;
1567 		}
1568 		if (te_offset + sizeof(ite) + ite.namelen > datalen) {
1569 			err = got_error(GOT_ERR_PRIVSEP_LEN);
1570 			break;
1571 		}
1572 
1573 		if (*nentries >= tree->nentries) {
1574 			err = got_error(GOT_ERR_PRIVSEP_LEN);
1575 			break;
1576 		}
1577 		te = &tree->entries[*nentries];
1578 		te_name = buf + sizeof(ite);
1579 		memcpy(te->name, te_name, ite.namelen);
1580 		te->name[ite.namelen] = '\0';
1581 		memcpy(te->id.sha1, ite.id, SHA1_DIGEST_LENGTH);
1582 		te->mode = ite.mode;
1583 		te->idx = *nentries;
1584 		(*nentries)++;
1585 
1586 		te_offset += sizeof(ite) + ite.namelen;
1587 	}
1588 
1589 	return err;
1590 }
1591 
1592 const struct got_error *
1593 got_privsep_recv_tree(struct got_tree_object **tree, struct imsgbuf *ibuf)
1594 {
1595 	const struct got_error *err = NULL;
1596 	const size_t min_datalen = sizeof(struct got_imsg_tree_object);
1597 	struct got_imsg_tree_object *itree;
1598 	int nentries = 0;
1599 
1600 	*tree = NULL;
1601 
1602 	while (*tree == NULL || nentries < (*tree)->nentries) {
1603 		struct imsg imsg;
1604 		size_t datalen;
1605 
1606 		err = got_privsep_recv_imsg(&imsg, ibuf, min_datalen);
1607 		if (err)
1608 			break;
1609 
1610 		datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
1611 
1612 		switch (imsg.hdr.type) {
1613 		case GOT_IMSG_TREE:
1614 			/* This message should only appear once. */
1615 			if (*tree != NULL) {
1616 				err = got_error(GOT_ERR_PRIVSEP_MSG);
1617 				break;
1618 			}
1619 			if (datalen != sizeof(*itree)) {
1620 				err = got_error(GOT_ERR_PRIVSEP_LEN);
1621 				break;
1622 			}
1623 			itree = imsg.data;
1624 			if (itree->nentries < 0) {
1625 				err = got_error(GOT_ERR_PRIVSEP_LEN);
1626 				break;
1627 			}
1628 			*tree = malloc(sizeof(**tree));
1629 			if (*tree == NULL) {
1630 				err = got_error_from_errno("malloc");
1631 				break;
1632 			}
1633 			(*tree)->entries = calloc(itree->nentries,
1634 			    sizeof(struct got_tree_entry));
1635 			if ((*tree)->entries == NULL) {
1636 				err = got_error_from_errno("malloc");
1637 				free(*tree);
1638 				*tree = NULL;
1639 				break;
1640 			}
1641 			(*tree)->nentries = itree->nentries;
1642 			(*tree)->refcnt = 0;
1643 			break;
1644 		case GOT_IMSG_TREE_ENTRIES:
1645 			/* This message should be preceeded by GOT_IMSG_TREE. */
1646 			if (*tree == NULL) {
1647 				err = got_error(GOT_ERR_PRIVSEP_MSG);
1648 				break;
1649 			}
1650 			err = recv_tree_entries(imsg.data, datalen,
1651 			    *tree, &nentries);
1652 			break;
1653 		default:
1654 			err = got_error(GOT_ERR_PRIVSEP_MSG);
1655 			break;
1656 		}
1657 
1658 		imsg_free(&imsg);
1659 		if (err)
1660 			break;
1661 	}
1662 
1663 	if (*tree && (*tree)->nentries != nentries) {
1664 		if (err == NULL)
1665 			err = got_error(GOT_ERR_PRIVSEP_LEN);
1666 		got_object_tree_close(*tree);
1667 		*tree = NULL;
1668 	}
1669 
1670 	return err;
1671 }
1672 
1673 const struct got_error *
1674 got_privsep_send_blob(struct imsgbuf *ibuf, size_t size, size_t hdrlen,
1675     const uint8_t *data)
1676 {
1677 	struct got_imsg_blob iblob;
1678 
1679 	memset(&iblob, 0, sizeof(iblob));
1680 	iblob.size = size;
1681 	iblob.hdrlen = hdrlen;
1682 
1683 	if (data) {
1684 		uint8_t *buf;
1685 
1686 		if (size > GOT_PRIVSEP_INLINE_BLOB_DATA_MAX)
1687 			return got_error(GOT_ERR_NO_SPACE);
1688 
1689 		buf = malloc(sizeof(iblob) + size);
1690 		if (buf == NULL)
1691 			return got_error_from_errno("malloc");
1692 
1693 		memcpy(buf, &iblob, sizeof(iblob));
1694 		memcpy(buf + sizeof(iblob), data, size);
1695 		if (imsg_compose(ibuf, GOT_IMSG_BLOB, 0, 0, -1, buf,
1696 		    sizeof(iblob) + size) == -1) {
1697 			free(buf);
1698 			return got_error_from_errno("imsg_compose BLOB");
1699 		}
1700 		free(buf);
1701 	} else {
1702 		/* Data has already been written to file descriptor. */
1703 		if (imsg_compose(ibuf, GOT_IMSG_BLOB, 0, 0, -1, &iblob,
1704 		    sizeof(iblob)) == -1)
1705 			return got_error_from_errno("imsg_compose BLOB");
1706 	}
1707 
1708 
1709 	return flush_imsg(ibuf);
1710 }
1711 
1712 const struct got_error *
1713 got_privsep_recv_blob(uint8_t **outbuf, size_t *size, size_t *hdrlen,
1714     struct imsgbuf *ibuf)
1715 {
1716 	const struct got_error *err = NULL;
1717 	struct imsg imsg;
1718 	struct got_imsg_blob *iblob;
1719 	size_t datalen;
1720 
1721 	*outbuf = NULL;
1722 
1723 	err = got_privsep_recv_imsg(&imsg, ibuf, 0);
1724 	if (err)
1725 		return err;
1726 
1727 	datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
1728 
1729 	switch (imsg.hdr.type) {
1730 	case GOT_IMSG_BLOB:
1731 		if (datalen < sizeof(*iblob)) {
1732 			err = got_error(GOT_ERR_PRIVSEP_LEN);
1733 			break;
1734 		}
1735 		iblob = imsg.data;
1736 		*size = iblob->size;
1737 		*hdrlen = iblob->hdrlen;
1738 
1739 		if (datalen == sizeof(*iblob)) {
1740 			/* Data has been written to file descriptor. */
1741 			break;
1742 		}
1743 
1744 		if (*size > GOT_PRIVSEP_INLINE_BLOB_DATA_MAX ||
1745 		    *size > datalen + sizeof(*iblob)) {
1746 			err = got_error(GOT_ERR_PRIVSEP_LEN);
1747 			break;
1748 		}
1749 
1750 		*outbuf = malloc(*size);
1751 		if (*outbuf == NULL) {
1752 			err = got_error_from_errno("malloc");
1753 			break;
1754 		}
1755 		memcpy(*outbuf, imsg.data + sizeof(*iblob), *size);
1756 		break;
1757 	default:
1758 		err = got_error(GOT_ERR_PRIVSEP_MSG);
1759 		break;
1760 	}
1761 
1762 	imsg_free(&imsg);
1763 
1764 	return err;
1765 }
1766 
1767 static const struct got_error *
1768 send_tagmsg(struct imsgbuf *ibuf, struct got_tag_object *tag, size_t tagmsg_len)
1769 {
1770 	const struct got_error *err = NULL;
1771 	size_t offset, remain;
1772 
1773 	offset = 0;
1774 	remain = tagmsg_len;
1775 	while (remain > 0) {
1776 		size_t n = MIN(MAX_IMSGSIZE - IMSG_HEADER_SIZE, remain);
1777 
1778 		if (imsg_compose(ibuf, GOT_IMSG_TAG_TAGMSG, 0, 0, -1,
1779 		    tag->tagmsg + offset, n) == -1) {
1780 			err = got_error_from_errno("imsg_compose TAG_TAGMSG");
1781 			break;
1782 		}
1783 
1784 		err = flush_imsg(ibuf);
1785 		if (err)
1786 			break;
1787 
1788 		offset += n;
1789 		remain -= n;
1790 	}
1791 
1792 	return err;
1793 }
1794 
1795 const struct got_error *
1796 got_privsep_send_tag(struct imsgbuf *ibuf, struct got_tag_object *tag)
1797 {
1798 	const struct got_error *err = NULL;
1799 	struct got_imsg_tag_object *itag;
1800 	uint8_t *buf;
1801 	size_t len, total;
1802 	size_t tag_len = strlen(tag->tag);
1803 	size_t tagger_len = strlen(tag->tagger);
1804 	size_t tagmsg_len = strlen(tag->tagmsg);
1805 
1806 	total = sizeof(*itag) + tag_len + tagger_len + tagmsg_len;
1807 
1808 	buf = malloc(total);
1809 	if (buf == NULL)
1810 		return got_error_from_errno("malloc");
1811 
1812 	itag = (struct got_imsg_tag_object *)buf;
1813 	memcpy(&itag->id, &tag->id, sizeof(itag->id));
1814 	itag->obj_type = tag->obj_type;
1815 	itag->tag_len = tag_len;
1816 	itag->tagger_len = tagger_len;
1817 	itag->tagger_time = tag->tagger_time;
1818 	itag->tagger_gmtoff = tag->tagger_gmtoff;
1819 	itag->tagmsg_len = tagmsg_len;
1820 
1821 	len = sizeof(*itag);
1822 	memcpy(buf + len, tag->tag, tag_len);
1823 	len += tag_len;
1824 	memcpy(buf + len, tag->tagger, tagger_len);
1825 	len += tagger_len;
1826 
1827 	if (imsg_compose(ibuf, GOT_IMSG_TAG, 0, 0, -1, buf, len) == -1) {
1828 		err = got_error_from_errno("imsg_compose TAG");
1829 		goto done;
1830 	}
1831 
1832 	if (tagmsg_len == 0 ||
1833 	    tagmsg_len + len > MAX_IMSGSIZE - IMSG_HEADER_SIZE) {
1834 		err = flush_imsg(ibuf);
1835 		if (err)
1836 			goto done;
1837 	}
1838 	err = send_tagmsg(ibuf, tag, tagmsg_len);
1839 done:
1840 	free(buf);
1841 	return err;
1842 }
1843 
1844 const struct got_error *
1845 got_privsep_recv_tag(struct got_tag_object **tag, struct imsgbuf *ibuf)
1846 {
1847 	const struct got_error *err = NULL;
1848 	struct imsg imsg;
1849 	struct got_imsg_tag_object *itag;
1850 	size_t len, datalen;
1851 	const size_t min_datalen = sizeof(struct got_imsg_tag_object);
1852 
1853 	*tag = NULL;
1854 
1855 	err = got_privsep_recv_imsg(&imsg, ibuf, min_datalen);
1856 	if (err)
1857 		return err;
1858 
1859 	datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
1860 	len = 0;
1861 
1862 	switch (imsg.hdr.type) {
1863 	case GOT_IMSG_TAG:
1864 		if (datalen < sizeof(*itag)) {
1865 			err = got_error(GOT_ERR_PRIVSEP_LEN);
1866 			break;
1867 		}
1868 		itag = imsg.data;
1869 		if (datalen != sizeof(*itag) + itag->tag_len +
1870 		    itag->tagger_len) {
1871 			err = got_error(GOT_ERR_PRIVSEP_LEN);
1872 			break;
1873 		}
1874 		len += sizeof(*itag);
1875 
1876 		*tag = calloc(1, sizeof(**tag));
1877 		if (*tag == NULL) {
1878 			err = got_error_from_errno("calloc");
1879 			break;
1880 		}
1881 
1882 		memcpy(&(*tag)->id, &itag->id, sizeof(itag->id));
1883 
1884 		(*tag)->tag = strndup(imsg.data + len, itag->tag_len);
1885 		if ((*tag)->tag == NULL) {
1886 			err = got_error_from_errno("strndup");
1887 			break;
1888 		}
1889 		len += itag->tag_len;
1890 
1891 		(*tag)->obj_type = itag->obj_type;
1892 		(*tag)->tagger_time = itag->tagger_time;
1893 		(*tag)->tagger_gmtoff = itag->tagger_gmtoff;
1894 
1895 		(*tag)->tagger = strndup(imsg.data + len, itag->tagger_len);
1896 		if ((*tag)->tagger == NULL) {
1897 			err = got_error_from_errno("strndup");
1898 			break;
1899 		}
1900 		len += itag->tagger_len;
1901 
1902 		if (itag->tagmsg_len == 0) {
1903 			(*tag)->tagmsg = strdup("");
1904 			if ((*tag)->tagmsg == NULL) {
1905 				err = got_error_from_errno("strdup");
1906 				break;
1907 			}
1908 		} else {
1909 			size_t offset = 0, remain = itag->tagmsg_len;
1910 
1911 			(*tag)->tagmsg = malloc(itag->tagmsg_len + 1);
1912 			if ((*tag)->tagmsg == NULL) {
1913 				err = got_error_from_errno("malloc");
1914 				break;
1915 			}
1916 			while (remain > 0) {
1917 				struct imsg imsg_log;
1918 				size_t n = MIN(MAX_IMSGSIZE - IMSG_HEADER_SIZE,
1919 				    remain);
1920 
1921 				err = got_privsep_recv_imsg(&imsg_log, ibuf, n);
1922 				if (err)
1923 					return err;
1924 
1925 				if (imsg_log.hdr.type != GOT_IMSG_TAG_TAGMSG)
1926 					return got_error(GOT_ERR_PRIVSEP_MSG);
1927 
1928 				memcpy((*tag)->tagmsg + offset, imsg_log.data,
1929 				    n);
1930 				imsg_free(&imsg_log);
1931 				offset += n;
1932 				remain -= n;
1933 			}
1934 			(*tag)->tagmsg[itag->tagmsg_len] = '\0';
1935 		}
1936 
1937 		break;
1938 	default:
1939 		err = got_error(GOT_ERR_PRIVSEP_MSG);
1940 		break;
1941 	}
1942 
1943 	imsg_free(&imsg);
1944 
1945 	return err;
1946 }
1947 
1948 const struct got_error *
1949 got_privsep_init_pack_child(struct imsgbuf *ibuf, struct got_pack *pack,
1950     struct got_packidx *packidx)
1951 {
1952 	const struct got_error *err = NULL;
1953 	struct got_imsg_packidx ipackidx;
1954 	struct got_imsg_pack ipack;
1955 	int fd;
1956 
1957 	memset(&ipackidx, 0, sizeof(ipackidx));
1958 	memset(&ipack, 0, sizeof(ipack));
1959 
1960 	ipackidx.len = packidx->len;
1961 	ipackidx.packfile_size = pack->filesize;
1962 	fd = dup(packidx->fd);
1963 	if (fd == -1)
1964 		return got_error_from_errno("dup");
1965 
1966 	if (imsg_compose(ibuf, GOT_IMSG_PACKIDX, 0, 0, fd, &ipackidx,
1967 	    sizeof(ipackidx)) == -1) {
1968 		err = got_error_from_errno("imsg_compose PACKIDX");
1969 		close(fd);
1970 		return err;
1971 	}
1972 
1973 	if (strlcpy(ipack.path_packfile, pack->path_packfile,
1974 	    sizeof(ipack.path_packfile)) >= sizeof(ipack.path_packfile))
1975 		return got_error(GOT_ERR_NO_SPACE);
1976 	ipack.filesize = pack->filesize;
1977 
1978 	fd = dup(pack->fd);
1979 	if (fd == -1)
1980 		return got_error_from_errno("dup");
1981 
1982 	if (imsg_compose(ibuf, GOT_IMSG_PACK, 0, 0, fd, &ipack, sizeof(ipack))
1983 	    == -1) {
1984 		err = got_error_from_errno("imsg_compose PACK");
1985 		close(fd);
1986 		return err;
1987 	}
1988 
1989 	return flush_imsg(ibuf);
1990 }
1991 
1992 const struct got_error *
1993 got_privsep_send_packed_obj_req(struct imsgbuf *ibuf, int idx,
1994     struct got_object_id *id)
1995 {
1996 	struct got_imsg_packed_object iobj;
1997 
1998 	memset(&iobj, 0, sizeof(iobj));
1999 	iobj.idx = idx;
2000 	memcpy(&iobj.id, id, sizeof(iobj.id));
2001 
2002 	if (imsg_compose(ibuf, GOT_IMSG_PACKED_OBJECT_REQUEST, 0, 0, -1,
2003 	    &iobj, sizeof(iobj)) == -1)
2004 		return got_error_from_errno("imsg_compose "
2005 		    "PACKED_OBJECT_REQUEST");
2006 
2007 	return flush_imsg(ibuf);
2008 }
2009 
2010 const struct got_error *
2011 got_privsep_send_packed_raw_obj_req(struct imsgbuf *ibuf, int idx,
2012     struct got_object_id *id)
2013 {
2014 	struct got_imsg_packed_object iobj;
2015 
2016 	memset(&iobj, 0, sizeof(iobj));
2017 	iobj.idx = idx;
2018 	memcpy(&iobj.id, id, sizeof(iobj.id));
2019 
2020 	if (imsg_compose(ibuf, GOT_IMSG_PACKED_RAW_OBJECT_REQUEST, 0, 0, -1,
2021 	    &iobj, sizeof(iobj)) == -1)
2022 		return got_error_from_errno("imsg_compose "
2023 		    "PACKED_OBJECT_REQUEST");
2024 
2025 	return flush_imsg(ibuf);
2026 }
2027 
2028 const struct got_error *
2029 got_privsep_send_gitconfig_parse_req(struct imsgbuf *ibuf, int fd)
2030 {
2031 	const struct got_error *err = NULL;
2032 
2033 	if (imsg_compose(ibuf, GOT_IMSG_GITCONFIG_PARSE_REQUEST, 0, 0, fd,
2034 	    NULL, 0) == -1) {
2035 		err = got_error_from_errno("imsg_compose "
2036 		    "GITCONFIG_PARSE_REQUEST");
2037 		close(fd);
2038 		return err;
2039 	}
2040 
2041 	return flush_imsg(ibuf);
2042 }
2043 
2044 const struct got_error *
2045 got_privsep_send_gitconfig_repository_format_version_req(struct imsgbuf *ibuf)
2046 {
2047 	if (imsg_compose(ibuf,
2048 	    GOT_IMSG_GITCONFIG_REPOSITORY_FORMAT_VERSION_REQUEST, 0, 0, -1,
2049 	    NULL, 0) == -1)
2050 		return got_error_from_errno("imsg_compose "
2051 		    "GITCONFIG_REPOSITORY_FORMAT_VERSION_REQUEST");
2052 
2053 	return flush_imsg(ibuf);
2054 }
2055 
2056 const struct got_error *
2057 got_privsep_send_gitconfig_repository_extensions_req(struct imsgbuf *ibuf)
2058 {
2059 	if (imsg_compose(ibuf,
2060 	    GOT_IMSG_GITCONFIG_REPOSITORY_EXTENSIONS_REQUEST, 0, 0, -1,
2061 	    NULL, 0) == -1)
2062 		return got_error_from_errno("imsg_compose "
2063 		    "GITCONFIG_REPOSITORY_EXTENSIONS_REQUEST");
2064 
2065 	return flush_imsg(ibuf);
2066 }
2067 
2068 
2069 const struct got_error *
2070 got_privsep_send_gitconfig_author_name_req(struct imsgbuf *ibuf)
2071 {
2072 	if (imsg_compose(ibuf,
2073 	    GOT_IMSG_GITCONFIG_AUTHOR_NAME_REQUEST, 0, 0, -1, NULL, 0) == -1)
2074 		return got_error_from_errno("imsg_compose "
2075 		    "GITCONFIG_AUTHOR_NAME_REQUEST");
2076 
2077 	return flush_imsg(ibuf);
2078 }
2079 
2080 const struct got_error *
2081 got_privsep_send_gitconfig_author_email_req(struct imsgbuf *ibuf)
2082 {
2083 	if (imsg_compose(ibuf,
2084 	    GOT_IMSG_GITCONFIG_AUTHOR_EMAIL_REQUEST, 0, 0, -1, NULL, 0) == -1)
2085 		return got_error_from_errno("imsg_compose "
2086 		    "GITCONFIG_AUTHOR_EMAIL_REQUEST");
2087 
2088 	return flush_imsg(ibuf);
2089 }
2090 
2091 const struct got_error *
2092 got_privsep_send_gitconfig_remotes_req(struct imsgbuf *ibuf)
2093 {
2094 	if (imsg_compose(ibuf,
2095 	    GOT_IMSG_GITCONFIG_REMOTES_REQUEST, 0, 0, -1, NULL, 0) == -1)
2096 		return got_error_from_errno("imsg_compose "
2097 		    "GITCONFIG_REMOTE_REQUEST");
2098 
2099 	return flush_imsg(ibuf);
2100 }
2101 
2102 const struct got_error *
2103 got_privsep_send_gitconfig_owner_req(struct imsgbuf *ibuf)
2104 {
2105 	if (imsg_compose(ibuf,
2106 	    GOT_IMSG_GITCONFIG_OWNER_REQUEST, 0, 0, -1, NULL, 0) == -1)
2107 		return got_error_from_errno("imsg_compose "
2108 		    "GITCONFIG_OWNER_REQUEST");
2109 
2110 	return flush_imsg(ibuf);
2111 }
2112 
2113 const struct got_error *
2114 got_privsep_recv_gitconfig_str(char **str, struct imsgbuf *ibuf)
2115 {
2116 	const struct got_error *err = NULL;
2117 	struct imsg imsg;
2118 	size_t datalen;
2119 
2120 	*str = NULL;
2121 
2122 	err = got_privsep_recv_imsg(&imsg, ibuf, 0);
2123 	if (err)
2124 		return err;
2125 	datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
2126 
2127 	switch (imsg.hdr.type) {
2128 	case GOT_IMSG_GITCONFIG_STR_VAL:
2129 		if (datalen == 0)
2130 			break;
2131 		*str = strndup(imsg.data, datalen);
2132 		if (*str == NULL) {
2133 			err = got_error_from_errno("strndup");
2134 			break;
2135 		}
2136 		break;
2137 	default:
2138 		err = got_error(GOT_ERR_PRIVSEP_MSG);
2139 		break;
2140 	}
2141 
2142 	imsg_free(&imsg);
2143 	return err;
2144 }
2145 
2146 const struct got_error *
2147 got_privsep_recv_gitconfig_pair(char **key, char **val, struct imsgbuf *ibuf)
2148 {
2149 	const struct got_error *err = NULL;
2150 	struct got_imsg_gitconfig_pair p;
2151 	struct imsg imsg;
2152 	size_t datalen;
2153 	uint8_t *data;
2154 
2155 	*key = *val = NULL;
2156 
2157 	err = got_privsep_recv_imsg(&imsg, ibuf, 0);
2158 	if (err)
2159 		return err;
2160 
2161 	data = imsg.data;
2162 	datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
2163 
2164 	if (imsg.hdr.type != GOT_IMSG_GITCONFIG_PAIR) {
2165 		err = got_error(GOT_ERR_PRIVSEP_MSG);
2166 		goto done;
2167 	}
2168 
2169 	if (datalen < sizeof(p)) {
2170 		err = got_error(GOT_ERR_PRIVSEP_LEN);
2171 		goto done;
2172 	}
2173 
2174 	memcpy(&p, data, sizeof(p));
2175 	data += sizeof(p);
2176 
2177 	if (datalen != sizeof(p) + p.klen + p.vlen) {
2178 		err = got_error(GOT_ERR_PRIVSEP_LEN);
2179 		goto done;
2180 	}
2181 
2182 	*key = strndup(data, p.klen);
2183 	if (*key == NULL) {
2184 		err = got_error_from_errno("strndup");
2185 		goto done;
2186 	}
2187 	data += p.klen;
2188 
2189 	*val = strndup(data, p.vlen);
2190 	if (*val == NULL) {
2191 		err = got_error_from_errno("strndup");
2192 		goto done;
2193 	}
2194 
2195 done:
2196 	imsg_free(&imsg);
2197 	return err;
2198 }
2199 
2200 const struct got_error *
2201 got_privsep_recv_gitconfig_int(int *val, struct imsgbuf *ibuf)
2202 {
2203 	const struct got_error *err = NULL;
2204 	struct imsg imsg;
2205 	size_t datalen;
2206 	const size_t min_datalen = sizeof(int);
2207 
2208 	*val = 0;
2209 
2210 	err = got_privsep_recv_imsg(&imsg, ibuf, min_datalen);
2211 	if (err)
2212 		return err;
2213 	datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
2214 
2215 	switch (imsg.hdr.type) {
2216 	case GOT_IMSG_GITCONFIG_INT_VAL:
2217 		if (datalen != sizeof(*val)) {
2218 			err = got_error(GOT_ERR_PRIVSEP_LEN);
2219 			break;
2220 		}
2221 		memcpy(val, imsg.data, sizeof(*val));
2222 		break;
2223 	default:
2224 		err = got_error(GOT_ERR_PRIVSEP_MSG);
2225 		break;
2226 	}
2227 
2228 	imsg_free(&imsg);
2229 	return err;
2230 }
2231 
2232 static void
2233 free_remote_data(struct got_remote_repo *remote)
2234 {
2235 	int i;
2236 
2237 	free(remote->name);
2238 	free(remote->fetch_url);
2239 	free(remote->send_url);
2240 	for (i = 0; i < remote->nfetch_branches; i++)
2241 		free(remote->fetch_branches[i]);
2242 	free(remote->fetch_branches);
2243 	for (i = 0; i < remote->nsend_branches; i++)
2244 		free(remote->send_branches[i]);
2245 	free(remote->send_branches);
2246 	for (i = 0; i < remote->nfetch_refs; i++)
2247 		free(remote->fetch_refs[i]);
2248 	free(remote->fetch_refs);
2249 }
2250 
2251 const struct got_error *
2252 got_privsep_recv_gitconfig_remotes(struct got_remote_repo **remotes,
2253     int *nremotes, struct imsgbuf *ibuf)
2254 {
2255 	const struct got_error *err = NULL;
2256 	struct imsg imsg;
2257 	size_t datalen;
2258 	struct got_imsg_remotes iremotes;
2259 	struct got_imsg_remote iremote;
2260 
2261 	*remotes = NULL;
2262 	*nremotes = 0;
2263 	iremotes.nremotes = 0;
2264 
2265 	err = got_privsep_recv_imsg(&imsg, ibuf, sizeof(iremotes));
2266 	if (err)
2267 		return err;
2268 	datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
2269 
2270 	switch (imsg.hdr.type) {
2271 	case GOT_IMSG_GITCONFIG_REMOTES:
2272 		if (datalen != sizeof(iremotes)) {
2273 			imsg_free(&imsg);
2274 			return got_error(GOT_ERR_PRIVSEP_LEN);
2275 		}
2276 		memcpy(&iremotes, imsg.data, sizeof(iremotes));
2277 		if (iremotes.nremotes == 0) {
2278 			imsg_free(&imsg);
2279 			return NULL;
2280 		}
2281 		break;
2282 	default:
2283 		imsg_free(&imsg);
2284 		return got_error(GOT_ERR_PRIVSEP_MSG);
2285 	}
2286 
2287 	imsg_free(&imsg);
2288 
2289 	*remotes = recallocarray(NULL, 0, iremotes.nremotes, sizeof(**remotes));
2290 	if (*remotes == NULL)
2291 		return got_error_from_errno("recallocarray");
2292 
2293 	while (*nremotes < iremotes.nremotes) {
2294 		struct got_remote_repo *remote;
2295 
2296 		err = got_privsep_recv_imsg(&imsg, ibuf, sizeof(iremote));
2297 		if (err)
2298 			break;
2299 		datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
2300 
2301 		switch (imsg.hdr.type) {
2302 		case GOT_IMSG_GITCONFIG_REMOTE:
2303 			remote = &(*remotes)[*nremotes];
2304 			memset(remote, 0, sizeof(*remote));
2305 			if (datalen < sizeof(iremote)) {
2306 				err = got_error(GOT_ERR_PRIVSEP_LEN);
2307 				break;
2308 			}
2309 			memcpy(&iremote, imsg.data, sizeof(iremote));
2310 			if (iremote.name_len == 0 ||
2311 			    iremote.fetch_url_len == 0 ||
2312 			    iremote.send_url_len == 0 ||
2313 			    (sizeof(iremote) + iremote.name_len +
2314 			    iremote.fetch_url_len + iremote.send_url_len) > datalen) {
2315 				err = got_error(GOT_ERR_PRIVSEP_LEN);
2316 				break;
2317 			}
2318 			remote->name = strndup(imsg.data + sizeof(iremote),
2319 			    iremote.name_len);
2320 			if (remote->name == NULL) {
2321 				err = got_error_from_errno("strndup");
2322 				break;
2323 			}
2324 			remote->fetch_url = strndup(imsg.data + sizeof(iremote) +
2325 			    iremote.name_len, iremote.fetch_url_len);
2326 			if (remote->fetch_url == NULL) {
2327 				err = got_error_from_errno("strndup");
2328 				free_remote_data(remote);
2329 				break;
2330 			}
2331 			remote->send_url = strndup(imsg.data + sizeof(iremote) +
2332 			    iremote.name_len + iremote.fetch_url_len,
2333 			    iremote.send_url_len);
2334 			if (remote->send_url == NULL) {
2335 				err = got_error_from_errno("strndup");
2336 				free_remote_data(remote);
2337 				break;
2338 			}
2339 			remote->mirror_references = iremote.mirror_references;
2340 			remote->fetch_all_branches = iremote.fetch_all_branches;
2341 			remote->nfetch_branches = 0;
2342 			remote->fetch_branches = NULL;
2343 			remote->nsend_branches = 0;
2344 			remote->send_branches = NULL;
2345 			remote->nfetch_refs = 0;
2346 			remote->fetch_refs = NULL;
2347 			(*nremotes)++;
2348 			break;
2349 		default:
2350 			err = got_error(GOT_ERR_PRIVSEP_MSG);
2351 			break;
2352 		}
2353 
2354 		imsg_free(&imsg);
2355 		if (err)
2356 			break;
2357 	}
2358 
2359 	if (err) {
2360 		int i;
2361 		for (i = 0; i < *nremotes; i++)
2362 			free_remote_data(&(*remotes)[i]);
2363 		free(*remotes);
2364 		*remotes = NULL;
2365 		*nremotes = 0;
2366 	}
2367 	return err;
2368 }
2369 
2370 const struct got_error *
2371 got_privsep_send_gotconfig_parse_req(struct imsgbuf *ibuf, int fd)
2372 {
2373 	const struct got_error *err = NULL;
2374 
2375 	if (imsg_compose(ibuf, GOT_IMSG_GOTCONFIG_PARSE_REQUEST, 0, 0, fd,
2376 	    NULL, 0) == -1) {
2377 		err = got_error_from_errno("imsg_compose "
2378 		    "GOTCONFIG_PARSE_REQUEST");
2379 		close(fd);
2380 		return err;
2381 	}
2382 
2383 	return flush_imsg(ibuf);
2384 }
2385 
2386 const struct got_error *
2387 got_privsep_send_gotconfig_author_req(struct imsgbuf *ibuf)
2388 {
2389 	if (imsg_compose(ibuf,
2390 	    GOT_IMSG_GOTCONFIG_AUTHOR_REQUEST, 0, 0, -1, NULL, 0) == -1)
2391 		return got_error_from_errno("imsg_compose "
2392 		    "GOTCONFIG_AUTHOR_REQUEST");
2393 
2394 	return flush_imsg(ibuf);
2395 }
2396 
2397 const struct got_error *
2398 got_privsep_send_gotconfig_allowed_signers_req(struct imsgbuf *ibuf)
2399 {
2400 	if (imsg_compose(ibuf,
2401 	    GOT_IMSG_GOTCONFIG_ALLOWEDSIGNERS_REQUEST, 0, 0, -1, NULL, 0) == -1)
2402 		return got_error_from_errno("imsg_compose "
2403 		    "GOTCONFIG_ALLOWEDSIGNERS_REQUEST");
2404 
2405 	return flush_imsg(ibuf);
2406 }
2407 
2408 const struct got_error *
2409 got_privsep_send_gotconfig_revoked_signers_req(struct imsgbuf *ibuf)
2410 {
2411 	if (imsg_compose(ibuf,
2412 	    GOT_IMSG_GOTCONFIG_REVOKEDSIGNERS_REQUEST, 0, 0, -1, NULL, 0) == -1)
2413 		return got_error_from_errno("imsg_compose "
2414 		    "GOTCONFIG_REVOKEDSIGNERS_REQUEST");
2415 
2416 	return flush_imsg(ibuf);
2417 }
2418 
2419 const struct got_error *
2420 got_privsep_send_gotconfig_signer_id_req(struct imsgbuf *ibuf)
2421 {
2422 	if (imsg_compose(ibuf,
2423 	    GOT_IMSG_GOTCONFIG_SIGNERID_REQUEST, 0, 0, -1, NULL, 0) == -1)
2424 		return got_error_from_errno("imsg_compose "
2425 		    "GOTCONFIG_SIGNERID_REQUEST");
2426 
2427 	return flush_imsg(ibuf);
2428 }
2429 
2430 const struct got_error *
2431 got_privsep_send_gotconfig_remotes_req(struct imsgbuf *ibuf)
2432 {
2433 	if (imsg_compose(ibuf,
2434 	    GOT_IMSG_GOTCONFIG_REMOTES_REQUEST, 0, 0, -1, NULL, 0) == -1)
2435 		return got_error_from_errno("imsg_compose "
2436 		    "GOTCONFIG_REMOTE_REQUEST");
2437 
2438 	return flush_imsg(ibuf);
2439 }
2440 
2441 const struct got_error *
2442 got_privsep_recv_gotconfig_str(char **str, struct imsgbuf *ibuf)
2443 {
2444 	const struct got_error *err = NULL;
2445 	struct imsg imsg;
2446 	size_t datalen;
2447 
2448 	*str = NULL;
2449 
2450 	err = got_privsep_recv_imsg(&imsg, ibuf, 0);
2451 	if (err)
2452 		return err;
2453 	datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
2454 
2455 	switch (imsg.hdr.type) {
2456 	case GOT_IMSG_GOTCONFIG_STR_VAL:
2457 		if (datalen == 0)
2458 			break;
2459 		*str = strndup(imsg.data, datalen);
2460 		if (*str == NULL) {
2461 			err = got_error_from_errno("strndup");
2462 			break;
2463 		}
2464 		break;
2465 	default:
2466 		err = got_error(GOT_ERR_PRIVSEP_MSG);
2467 		break;
2468 	}
2469 
2470 	imsg_free(&imsg);
2471 	return err;
2472 }
2473 
2474 const struct got_error *
2475 got_privsep_recv_gotconfig_remotes(struct got_remote_repo **remotes,
2476     int *nremotes, struct imsgbuf *ibuf)
2477 {
2478 	const struct got_error *err = NULL;
2479 	struct imsg imsg;
2480 	size_t datalen;
2481 	struct got_imsg_remotes iremotes;
2482 	struct got_imsg_remote iremote;
2483 	const size_t min_datalen = sizeof(iremotes);
2484 
2485 	*remotes = NULL;
2486 	*nremotes = 0;
2487 	iremotes.nremotes = 0;
2488 
2489 	err = got_privsep_recv_imsg(&imsg, ibuf, min_datalen);
2490 	if (err)
2491 		return err;
2492 	datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
2493 
2494 	switch (imsg.hdr.type) {
2495 	case GOT_IMSG_GOTCONFIG_REMOTES:
2496 		if (datalen != sizeof(iremotes)) {
2497 			err = got_error(GOT_ERR_PRIVSEP_LEN);
2498 			break;
2499 		}
2500 		memcpy(&iremotes, imsg.data, sizeof(iremotes));
2501 		if (iremotes.nremotes < 0) {
2502 			err = got_error(GOT_ERR_PRIVSEP_LEN);
2503 			break;
2504 		}
2505 		if (iremotes.nremotes == 0) {
2506 			imsg_free(&imsg);
2507 			return NULL;
2508 		}
2509 		break;
2510 	default:
2511 		imsg_free(&imsg);
2512 		return got_error(GOT_ERR_PRIVSEP_MSG);
2513 	}
2514 
2515 	imsg_free(&imsg);
2516 
2517 	*remotes = recallocarray(NULL, 0, iremotes.nremotes, sizeof(**remotes));
2518 	if (*remotes == NULL)
2519 		return got_error_from_errno("recallocarray");
2520 
2521 	while (*nremotes < iremotes.nremotes) {
2522 		struct got_remote_repo *remote;
2523 		const size_t min_datalen = sizeof(iremote);
2524 		int i;
2525 
2526 		err = got_privsep_recv_imsg(&imsg, ibuf, min_datalen);
2527 		if (err)
2528 			break;
2529 		datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
2530 
2531 		switch (imsg.hdr.type) {
2532 		case GOT_IMSG_GOTCONFIG_REMOTE:
2533 			remote = &(*remotes)[*nremotes];
2534 			memset(remote, 0, sizeof(*remote));
2535 			if (datalen < sizeof(iremote)) {
2536 				err = got_error(GOT_ERR_PRIVSEP_LEN);
2537 				break;
2538 			}
2539 			memcpy(&iremote, imsg.data, sizeof(iremote));
2540 			if (iremote.name_len == 0 ||
2541 			    (iremote.fetch_url_len == 0 &&
2542 			    iremote.send_url_len == 0) ||
2543 			    (sizeof(iremote) + iremote.name_len +
2544 			    iremote.fetch_url_len + iremote.send_url_len) >
2545 			    datalen) {
2546 				err = got_error(GOT_ERR_PRIVSEP_LEN);
2547 				break;
2548 			}
2549 			remote->name = strndup(imsg.data + sizeof(iremote),
2550 			    iremote.name_len);
2551 			if (remote->name == NULL) {
2552 				err = got_error_from_errno("strndup");
2553 				break;
2554 			}
2555 			remote->fetch_url = strndup(imsg.data +
2556 			    sizeof(iremote) + iremote.name_len,
2557 			    iremote.fetch_url_len);
2558 			if (remote->fetch_url == NULL) {
2559 				err = got_error_from_errno("strndup");
2560 				free_remote_data(remote);
2561 				break;
2562 			}
2563 			remote->send_url = strndup(imsg.data +
2564 			    sizeof(iremote) + iremote.name_len +
2565 			    iremote.fetch_url_len, iremote.send_url_len);
2566 			if (remote->send_url == NULL) {
2567 				err = got_error_from_errno("strndup");
2568 				free_remote_data(remote);
2569 				break;
2570 			}
2571 			remote->mirror_references = iremote.mirror_references;
2572 			remote->fetch_all_branches = iremote.fetch_all_branches;
2573 			if (iremote.nfetch_branches > 0) {
2574 				remote->fetch_branches = recallocarray(NULL, 0,
2575 				    iremote.nfetch_branches, sizeof(char *));
2576 				if (remote->fetch_branches == NULL) {
2577 					err = got_error_from_errno("calloc");
2578 					free_remote_data(remote);
2579 					break;
2580 				}
2581 			}
2582 			remote->nfetch_branches = 0;
2583 			for (i = 0; i < iremote.nfetch_branches; i++) {
2584 				char *branch;
2585 				err = got_privsep_recv_gotconfig_str(&branch,
2586 				    ibuf);
2587 				if (err) {
2588 					free_remote_data(remote);
2589 					goto done;
2590 				}
2591 				remote->fetch_branches[i] = branch;
2592 				remote->nfetch_branches++;
2593 			}
2594 			if (iremote.nsend_branches > 0) {
2595 				remote->send_branches = recallocarray(NULL, 0,
2596 				    iremote.nsend_branches, sizeof(char *));
2597 				if (remote->send_branches == NULL) {
2598 					err = got_error_from_errno("calloc");
2599 					free_remote_data(remote);
2600 					break;
2601 				}
2602 			}
2603 			remote->nsend_branches = 0;
2604 			for (i = 0; i < iremote.nsend_branches; i++) {
2605 				char *branch;
2606 				err = got_privsep_recv_gotconfig_str(&branch,
2607 				    ibuf);
2608 				if (err) {
2609 					free_remote_data(remote);
2610 					goto done;
2611 				}
2612 				remote->send_branches[i] = branch;
2613 				remote->nsend_branches++;
2614 			}
2615 			if (iremote.nfetch_refs > 0) {
2616 				remote->fetch_refs = recallocarray(NULL, 0,
2617 				    iremote.nfetch_refs, sizeof(char *));
2618 				if (remote->fetch_refs == NULL) {
2619 					err = got_error_from_errno("calloc");
2620 					free_remote_data(remote);
2621 					break;
2622 				}
2623 			}
2624 			remote->nfetch_refs = 0;
2625 			for (i = 0; i < iremote.nfetch_refs; i++) {
2626 				char *ref;
2627 				err = got_privsep_recv_gotconfig_str(&ref,
2628 				    ibuf);
2629 				if (err) {
2630 					free_remote_data(remote);
2631 					goto done;
2632 				}
2633 				remote->fetch_refs[i] = ref;
2634 				remote->nfetch_refs++;
2635 			}
2636 			(*nremotes)++;
2637 			break;
2638 		default:
2639 			err = got_error(GOT_ERR_PRIVSEP_MSG);
2640 			break;
2641 		}
2642 
2643 		imsg_free(&imsg);
2644 		if (err)
2645 			break;
2646 	}
2647 done:
2648 	if (err) {
2649 		int i;
2650 		for (i = 0; i < *nremotes; i++)
2651 			free_remote_data(&(*remotes)[i]);
2652 		free(*remotes);
2653 		*remotes = NULL;
2654 		*nremotes = 0;
2655 	}
2656 	return err;
2657 }
2658 
2659 const struct got_error *
2660 got_privsep_send_commit_traversal_request(struct imsgbuf *ibuf,
2661     struct got_object_id *id, int idx, const char *path)
2662 {
2663 	struct ibuf *wbuf;
2664 	size_t path_len = strlen(path);
2665 
2666 	wbuf = imsg_create(ibuf, GOT_IMSG_COMMIT_TRAVERSAL_REQUEST, 0, 0,
2667 	    sizeof(struct got_imsg_commit_traversal_request) + path_len);
2668 	if (wbuf == NULL)
2669 		return got_error_from_errno(
2670 		    "imsg_create COMMIT_TRAVERSAL_REQUEST");
2671 	/*
2672 	 * Keep in sync with struct got_imsg_commit_traversal_request
2673 	 * and struct got_imsg_packed_object.
2674 	 */
2675 	if (imsg_add(wbuf, id, sizeof(*id)) == -1)
2676 		return got_error_from_errno("imsg_add "
2677 		    "COMMIT_TRAVERSAL_REQUEST");
2678 	if (imsg_add(wbuf, &idx, sizeof(idx)) == -1)
2679 		return got_error_from_errno("imsg_add "
2680 		    "COMMIT_TRAVERSAL_REQUEST");
2681 	if (imsg_add(wbuf, &path_len, sizeof(path_len)) == -1)
2682 		return got_error_from_errno("imsg_add "
2683 		    "COMMIT_TRAVERSAL_REQUEST");
2684 	if (imsg_add(wbuf, path, path_len) == -1)
2685 		return got_error_from_errno("imsg_add "
2686 		    "COMMIT_TRAVERSAL_REQUEST");
2687 
2688 	imsg_close(ibuf, wbuf);
2689 	return flush_imsg(ibuf);
2690 }
2691 
2692 const struct got_error *
2693 got_privsep_recv_traversed_commits(struct got_commit_object **changed_commit,
2694     struct got_object_id **changed_commit_id,
2695     struct got_object_id_queue *commit_ids, struct imsgbuf *ibuf)
2696 {
2697 	const struct got_error *err = NULL;
2698 	struct imsg imsg;
2699 	struct got_imsg_traversed_commits *icommits;
2700 	struct got_object_id *ids;
2701 	size_t datalen;
2702 	int i, done = 0;
2703 
2704 	*changed_commit = NULL;
2705 	*changed_commit_id = NULL;
2706 
2707 	while (!done) {
2708 		err = got_privsep_recv_imsg(&imsg, ibuf, 0);
2709 		if (err)
2710 			return err;
2711 
2712 		datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
2713 		switch (imsg.hdr.type) {
2714 		case GOT_IMSG_TRAVERSED_COMMITS:
2715 			icommits = imsg.data;
2716 			if (datalen != sizeof(*icommits) +
2717 			    icommits->ncommits * sizeof(*ids)) {
2718 				err = got_error(GOT_ERR_PRIVSEP_LEN);
2719 				break;
2720 			}
2721 			ids = imsg.data + sizeof(*icommits);
2722 			for (i = 0; i < icommits->ncommits; i++) {
2723 				struct got_object_qid *qid;
2724 
2725 				err = got_object_qid_alloc_partial(&qid);
2726 				if (err)
2727 					break;
2728 				memcpy(&qid->id, &ids[i], sizeof(ids[i]));
2729 				STAILQ_INSERT_TAIL(commit_ids, qid, entry);
2730 
2731 				/* The last commit may contain a change. */
2732 				if (i == icommits->ncommits - 1) {
2733 					*changed_commit_id =
2734 					    got_object_id_dup(&qid->id);
2735 					if (*changed_commit_id == NULL) {
2736 						err = got_error_from_errno(
2737 						    "got_object_id_dup");
2738 						break;
2739 					}
2740 				}
2741 			}
2742 			break;
2743 		case GOT_IMSG_COMMIT:
2744 			if (*changed_commit_id == NULL) {
2745 				err = got_error(GOT_ERR_PRIVSEP_MSG);
2746 				break;
2747 			}
2748 			err = get_commit_from_imsg(changed_commit, &imsg,
2749 			    datalen, ibuf);
2750 			break;
2751 		case GOT_IMSG_COMMIT_TRAVERSAL_DONE:
2752 			done = 1;
2753 			break;
2754 		default:
2755 			err = got_error(GOT_ERR_PRIVSEP_MSG);
2756 			break;
2757 		}
2758 
2759 		imsg_free(&imsg);
2760 		if (err)
2761 			break;
2762 	}
2763 
2764 	if (err)
2765 		got_object_id_queue_free(commit_ids);
2766 	return err;
2767 }
2768 
2769 const struct got_error *
2770 got_privsep_send_enumerated_tree(size_t *totlen, struct imsgbuf *ibuf,
2771     struct got_object_id *tree_id, const char *path,
2772     struct got_parsed_tree_entry *entries, int nentries)
2773 {
2774 	const struct got_error *err = NULL;
2775 	struct ibuf *wbuf;
2776 	size_t path_len = strlen(path);
2777 	size_t msglen;
2778 
2779 	msglen = sizeof(struct got_imsg_enumerated_tree) + path_len;
2780 	wbuf = imsg_create(ibuf, GOT_IMSG_ENUMERATED_TREE, 0, 0, msglen);
2781 	if (wbuf == NULL)
2782 		return got_error_from_errno("imsg_create ENUMERATED_TREE");
2783 
2784 	if (imsg_add(wbuf, tree_id->sha1, SHA1_DIGEST_LENGTH) == -1)
2785 		return got_error_from_errno("imsg_add ENUMERATED_TREE");
2786 	if (imsg_add(wbuf, &nentries, sizeof(nentries)) == -1)
2787 		return got_error_from_errno("imsg_add ENUMERATED_TREE");
2788 	if (imsg_add(wbuf, path, path_len) == -1)
2789 		return got_error_from_errno("imsg_add ENUMERATED_TREE");
2790 
2791 	imsg_close(ibuf, wbuf);
2792 
2793 	if (entries) {
2794 		err = send_tree_entries(ibuf, entries, nentries);
2795 		if (err)
2796 			return err;
2797 	}
2798 
2799 	return flush_imsg(ibuf);
2800 }
2801 
2802 const struct got_error *
2803 got_privsep_send_object_enumeration_request(struct imsgbuf *ibuf)
2804 {
2805 	if (imsg_compose(ibuf, GOT_IMSG_OBJECT_ENUMERATION_REQUEST,
2806 	    0, 0, -1, NULL, 0) == -1)
2807 		return got_error_from_errno("imsg_compose "
2808 		    "OBJECT_ENUMERATION_REQUEST");
2809 
2810 	return flush_imsg(ibuf);
2811 }
2812 
2813 const struct got_error *
2814 got_privsep_send_object_enumeration_done(struct imsgbuf *ibuf)
2815 {
2816 	if (imsg_compose(ibuf, GOT_IMSG_OBJECT_ENUMERATION_DONE,
2817 	    0, 0, -1, NULL, 0) == -1)
2818 		return got_error_from_errno("imsg_compose "
2819 		    "OBJECT_ENUMERATION_DONE");
2820 
2821 	return flush_imsg(ibuf);
2822 }
2823 
2824 const struct got_error *
2825 got_privsep_send_object_enumeration_incomplete(struct imsgbuf *ibuf)
2826 {
2827 	if (imsg_compose(ibuf, GOT_IMSG_OBJECT_ENUMERATION_INCOMPLETE,
2828 	    0, 0, -1, NULL, 0) == -1)
2829 		return got_error_from_errno("imsg_compose "
2830 		    "OBJECT_ENUMERATION_INCOMPLETE");
2831 
2832 	return flush_imsg(ibuf);
2833 }
2834 
2835 const struct got_error *
2836 got_privsep_send_enumerated_commit(struct imsgbuf *ibuf,
2837     struct got_object_id *id, time_t mtime)
2838 {
2839 	struct ibuf *wbuf;
2840 
2841 	wbuf = imsg_create(ibuf, GOT_IMSG_ENUMERATED_COMMIT, 0, 0,
2842 	    sizeof(struct got_imsg_enumerated_commit) + SHA1_DIGEST_LENGTH);
2843 	if (wbuf == NULL)
2844 		return got_error_from_errno("imsg_create ENUMERATED_COMMIT");
2845 
2846 	/* Keep in sync with struct got_imsg_enumerated_commit! */
2847 	if (imsg_add(wbuf, id, SHA1_DIGEST_LENGTH) == -1)
2848 		return got_error_from_errno("imsg_add ENUMERATED_COMMIT");
2849 	if (imsg_add(wbuf, &mtime, sizeof(mtime)) == -1)
2850 		return got_error_from_errno("imsg_add ENUMERATED_COMMIT");
2851 
2852 	imsg_close(ibuf, wbuf);
2853 	/* Don't flush yet, tree entries or ENUMERATION_DONE will follow. */
2854 	return NULL;
2855 }
2856 
2857 const struct got_error *
2858 got_privsep_recv_enumerated_objects(int *found_all_objects,
2859     struct imsgbuf *ibuf,
2860     got_object_enumerate_commit_cb cb_commit,
2861     got_object_enumerate_tree_cb cb_tree, void *cb_arg,
2862     struct got_repository *repo)
2863 {
2864 	const struct got_error *err = NULL;
2865 	struct imsg imsg;
2866 	struct got_imsg_enumerated_commit *icommit = NULL;
2867 	struct got_object_id commit_id;
2868 	int have_commit = 0;
2869 	time_t mtime = 0;
2870 	struct got_tree_object tree;
2871 	struct got_imsg_enumerated_tree *itree;
2872 	struct got_object_id tree_id;
2873 	char *path = NULL, *canon_path = NULL;
2874 	size_t datalen, path_len;
2875 	int nentries = -1;
2876 	int done = 0;
2877 
2878 	*found_all_objects = 0;
2879 	memset(&tree, 0, sizeof(tree));
2880 
2881 	while (!done) {
2882 		err = got_privsep_recv_imsg(&imsg, ibuf, 0);
2883 		if (err)
2884 			break;
2885 
2886 		datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
2887 		switch (imsg.hdr.type) {
2888 		case GOT_IMSG_ENUMERATED_COMMIT:
2889 			if (have_commit && nentries != -1) {
2890 				err = got_error(GOT_ERR_PRIVSEP_MSG);
2891 				break;
2892 			}
2893 			if (datalen != sizeof(*icommit)) {
2894 				err = got_error(GOT_ERR_PRIVSEP_LEN);
2895 				break;
2896 			}
2897 			icommit = (struct got_imsg_enumerated_commit *)imsg.data;
2898 			memcpy(commit_id.sha1, icommit->id, SHA1_DIGEST_LENGTH);
2899 			mtime = icommit->mtime;
2900 			have_commit = 1;
2901 			break;
2902 		case GOT_IMSG_ENUMERATED_TREE:
2903 			/* Should be preceeded by GOT_IMSG_ENUMERATED_COMMIT. */
2904 			if (!have_commit) {
2905 				err = got_error(GOT_ERR_PRIVSEP_MSG);
2906 				break;
2907 			}
2908 			if (datalen < sizeof(*itree)) {
2909 				err = got_error(GOT_ERR_PRIVSEP_LEN);
2910 				break;
2911 			}
2912 			itree = imsg.data;
2913 			path_len = datalen - sizeof(*itree);
2914 			if (path_len == 0) {
2915 				err = got_error(GOT_ERR_PRIVSEP_LEN);
2916 				break;
2917 			}
2918 			memcpy(tree_id.sha1, itree->id, sizeof(tree_id.sha1));
2919 			free(path);
2920 			path = strndup(imsg.data + sizeof(*itree), path_len);
2921 			if (path == NULL) {
2922 				err = got_error_from_errno("strndup");
2923 				break;
2924 			}
2925 			free(canon_path);
2926 			canon_path = malloc(path_len + 1);
2927 			if (canon_path == NULL) {
2928 				err = got_error_from_errno("malloc");
2929 				break;
2930 			}
2931 			if (!got_path_is_absolute(path)) {
2932 				err = got_error(GOT_ERR_BAD_PATH);
2933 				break;
2934 			}
2935 			if (got_path_is_root_dir(path)) {
2936 				/* XXX check what got_canonpath() does wrong */
2937 				canon_path[0] = '/';
2938 				canon_path[1] = '\0';
2939 			} else {
2940 				err = got_canonpath(path, canon_path,
2941 				    path_len + 1);
2942 				if (err)
2943 					break;
2944 			}
2945 			if (strcmp(path, canon_path) != 0) {
2946 				err = got_error(GOT_ERR_BAD_PATH);
2947 				break;
2948 			}
2949 			if (nentries != -1) {
2950 				err = got_error(GOT_ERR_PRIVSEP_MSG);
2951 				break;
2952 			}
2953 			if (itree->nentries < -1) {
2954 				err = got_error(GOT_ERR_PRIVSEP_MSG);
2955 				break;
2956 			}
2957 			if (itree->nentries == -1) {
2958 				/* Tree was not found in pack file. */
2959 				err = cb_tree(cb_arg, NULL, mtime, &tree_id,
2960 				    path, repo);
2961 				break;
2962 			}
2963 			if (itree->nentries > INT_MAX) {
2964 				err = got_error(GOT_ERR_PRIVSEP_LEN);
2965 				break;
2966 			}
2967 			tree.entries = calloc(itree->nentries,
2968 			    sizeof(struct got_tree_entry));
2969 			if (tree.entries == NULL) {
2970 				err = got_error_from_errno("calloc");
2971 				break;
2972 			}
2973 			if (itree->nentries == 0) {
2974 				err = cb_tree(cb_arg, &tree, mtime, &tree_id,
2975 				    path, repo);
2976 				if (err)
2977 					break;
2978 
2979 				/* Prepare for next tree. */
2980 				free(tree.entries);
2981 				memset(&tree, 0, sizeof(tree));
2982 				nentries = -1;
2983 			} else {
2984 				tree.nentries = itree->nentries;
2985 				nentries = 0;
2986 			}
2987 			break;
2988 		case GOT_IMSG_TREE_ENTRIES:
2989 			/* Should be preceeded by GOT_IMSG_ENUMERATED_TREE. */
2990 			if (nentries <= -1) {
2991 				err = got_error(GOT_ERR_PRIVSEP_MSG);
2992 				break;
2993 			}
2994 			err = recv_tree_entries(imsg.data, datalen,
2995 			    &tree, &nentries);
2996 			if (err)
2997 				break;
2998 			if (tree.nentries == nentries) {
2999 				err = cb_tree(cb_arg, &tree, mtime, &tree_id,
3000 				    path, repo);
3001 				if (err)
3002 					break;
3003 
3004 				/* Prepare for next tree. */
3005 				free(tree.entries);
3006 				memset(&tree, 0, sizeof(tree));
3007 				nentries = -1;
3008 			}
3009 			break;
3010 		case GOT_IMSG_TREE_ENUMERATION_DONE:
3011 			/* All trees have been found and traversed. */
3012 			if (!have_commit || path == NULL || nentries != -1) {
3013 				err = got_error(GOT_ERR_PRIVSEP_MSG);
3014 				break;
3015 			}
3016 			err = cb_commit(cb_arg, mtime, &commit_id, repo);
3017 			if (err)
3018 				break;
3019 			have_commit = 0;
3020 			break;
3021 		case GOT_IMSG_OBJECT_ENUMERATION_DONE:
3022 			*found_all_objects = 1;
3023 			done = 1;
3024 			break;
3025 		case GOT_IMSG_OBJECT_ENUMERATION_INCOMPLETE:
3026 			done = 1;
3027 			break;
3028 		default:
3029 			err = got_error(GOT_ERR_PRIVSEP_MSG);
3030 			break;
3031 		}
3032 
3033 		imsg_free(&imsg);
3034 		if (err)
3035 			break;
3036 	}
3037 
3038 	free(path);
3039 	free(canon_path);
3040 	free(tree.entries);
3041 	return err;
3042 }
3043 
3044 const struct got_error *
3045 got_privsep_send_raw_delta_req(struct imsgbuf *ibuf, int idx,
3046     struct got_object_id *id)
3047 {
3048 	struct got_imsg_raw_delta_request dreq;
3049 
3050 	memset(&dreq, 0, sizeof(dreq));
3051 	dreq.idx = idx;
3052 	memcpy(&dreq.id, id, sizeof(dreq.id));
3053 
3054 	if (imsg_compose(ibuf, GOT_IMSG_RAW_DELTA_REQUEST, 0, 0, -1,
3055 	    &dreq, sizeof(dreq)) == -1)
3056 		return got_error_from_errno("imsg_compose RAW_DELTA_REQUEST");
3057 
3058 	return flush_imsg(ibuf);
3059 }
3060 
3061 const struct got_error *
3062 got_privsep_send_raw_delta_outfd(struct imsgbuf *ibuf, int fd)
3063 {
3064 	return send_fd(ibuf, GOT_IMSG_RAW_DELTA_OUTFD, fd);
3065 }
3066 
3067 const struct got_error *
3068 got_privsep_send_raw_delta(struct imsgbuf *ibuf, uint64_t base_size,
3069     uint64_t result_size,  off_t delta_size, off_t delta_compressed_size,
3070     off_t delta_offset, off_t delta_out_offset, struct got_object_id *base_id)
3071 {
3072 	struct got_imsg_raw_delta idelta;
3073 	int ret;
3074 
3075 	memset(&idelta, 0, sizeof(idelta));
3076 	idelta.base_size = base_size;
3077 	idelta.result_size = result_size;
3078 	idelta.delta_size = delta_size;
3079 	idelta.delta_compressed_size = delta_compressed_size;
3080 	idelta.delta_offset = delta_offset;
3081 	idelta.delta_out_offset = delta_out_offset;
3082 	memcpy(&idelta.base_id, &base_id, sizeof(idelta.base_id));
3083 
3084 	ret = imsg_compose(ibuf, GOT_IMSG_RAW_DELTA, 0, 0, -1,
3085 	    &idelta, sizeof(idelta));
3086 	if (ret == -1)
3087 		return got_error_from_errno("imsg_compose RAW_DELTA");
3088 
3089 	return flush_imsg(ibuf);
3090 }
3091 
3092 const struct got_error *
3093 got_privsep_recv_raw_delta(uint64_t *base_size, uint64_t *result_size,
3094     off_t *delta_size, off_t *delta_compressed_size, off_t *delta_offset,
3095     off_t *delta_out_offset, struct got_object_id **base_id,
3096     struct imsgbuf *ibuf)
3097 {
3098 	const struct got_error *err = NULL;
3099 	struct imsg imsg;
3100 	struct got_imsg_raw_delta *delta;
3101 	size_t datalen;
3102 
3103 	*base_size = 0;
3104 	*result_size = 0;
3105 	*delta_size = 0;
3106 	*delta_compressed_size = 0;
3107 	*delta_offset = 0;
3108 	*delta_out_offset = 0;
3109 	*base_id = NULL;
3110 
3111 	err = got_privsep_recv_imsg(&imsg, ibuf, 0);
3112 	if (err)
3113 		return err;
3114 
3115 	datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
3116 
3117 	switch (imsg.hdr.type) {
3118 	case GOT_IMSG_RAW_DELTA:
3119 		if (datalen != sizeof(*delta)) {
3120 			err = got_error(GOT_ERR_PRIVSEP_LEN);
3121 			break;
3122 		}
3123 		delta = imsg.data;
3124 		*base_size = delta->base_size;
3125 		*result_size = delta->result_size;
3126 		*delta_size = delta->delta_size;
3127 		*delta_compressed_size = delta->delta_compressed_size;
3128 		*delta_offset = delta->delta_offset;
3129 		*delta_out_offset = delta->delta_out_offset;
3130 		*base_id = calloc(1, sizeof(**base_id));
3131 		if (*base_id == NULL) {
3132 			err = got_error_from_errno("malloc");
3133 			break;
3134 		}
3135 		memcpy(*base_id, &delta->base_id, sizeof(**base_id));
3136 		break;
3137 	default:
3138 		err = got_error(GOT_ERR_PRIVSEP_MSG);
3139 		break;
3140 	}
3141 
3142 	imsg_free(&imsg);
3143 
3144 	if (err) {
3145 		free(*base_id);
3146 		*base_id = NULL;
3147 	}
3148 	return err;
3149 }
3150 
3151 static const struct got_error *
3152 send_idlist(struct imsgbuf *ibuf, struct got_object_id **ids, size_t nids)
3153 {
3154 	const struct got_error *err = NULL;
3155 	struct got_imsg_object_idlist idlist;
3156 	struct ibuf *wbuf;
3157 	size_t i;
3158 
3159 	memset(&idlist, 0, sizeof(idlist));
3160 
3161 	if (nids > GOT_IMSG_OBJ_ID_LIST_MAX_NIDS)
3162 		return got_error(GOT_ERR_NO_SPACE);
3163 
3164 	wbuf = imsg_create(ibuf, GOT_IMSG_OBJ_ID_LIST, 0, 0,
3165 	    sizeof(idlist) + nids * sizeof(**ids));
3166 	if (wbuf == NULL) {
3167 		err = got_error_from_errno("imsg_create OBJ_ID_LIST");
3168 		return err;
3169 	}
3170 
3171 	idlist.nids = nids;
3172 	if (imsg_add(wbuf, &idlist, sizeof(idlist)) == -1)
3173 		return got_error_from_errno("imsg_add OBJ_ID_LIST");
3174 
3175 	for (i = 0; i < nids; i++) {
3176 		struct got_object_id *id = ids[i];
3177 		if (imsg_add(wbuf, id, sizeof(*id)) == -1)
3178 			return got_error_from_errno("imsg_add OBJ_ID_LIST");
3179 	}
3180 
3181 	imsg_close(ibuf, wbuf);
3182 
3183 	return flush_imsg(ibuf);
3184 }
3185 
3186 const struct got_error *
3187 got_privsep_send_object_idlist(struct imsgbuf *ibuf,
3188     struct got_object_id **ids, size_t nids)
3189 {
3190 	const struct got_error *err = NULL;
3191 	struct got_object_id *idlist[GOT_IMSG_OBJ_ID_LIST_MAX_NIDS];
3192 	int i, queued = 0;
3193 
3194 	for (i = 0; i < nids; i++) {
3195 		idlist[i % nitems(idlist)] = ids[i];
3196 		queued++;
3197 		if (queued >= nitems(idlist)) {
3198 			err = send_idlist(ibuf, idlist, queued);
3199 			if (err)
3200 				return err;
3201 			queued = 0;
3202 		}
3203 	}
3204 
3205 	if (queued > 0) {
3206 		err = send_idlist(ibuf, idlist, queued);
3207 		if (err)
3208 			return err;
3209 	}
3210 
3211 	return NULL;
3212 }
3213 
3214 const struct got_error *
3215 got_privsep_send_object_idlist_done(struct imsgbuf *ibuf)
3216 {
3217 	if (imsg_compose(ibuf, GOT_IMSG_OBJ_ID_LIST_DONE, 0, 0, -1, NULL, 0)
3218 	    == -1)
3219 		return got_error_from_errno("imsg_compose OBJ_ID_LIST_DONE");
3220 
3221 	return flush_imsg(ibuf);
3222 }
3223 
3224 const struct got_error *
3225 got_privsep_recv_object_idlist(int *done, struct got_object_id **ids,
3226     size_t *nids, struct imsgbuf *ibuf)
3227 {
3228 	const struct got_error *err = NULL;
3229 	struct imsg imsg;
3230 	struct got_imsg_object_idlist *idlist;
3231 	size_t datalen;
3232 
3233 	*ids = NULL;
3234 	*done = 0;
3235 	*nids = 0;
3236 
3237 	err = got_privsep_recv_imsg(&imsg, ibuf, 0);
3238 	if (err)
3239 		return err;
3240 
3241 	datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
3242 	switch (imsg.hdr.type) {
3243 	case GOT_IMSG_OBJ_ID_LIST:
3244 		if (datalen < sizeof(*idlist)) {
3245 			err = got_error(GOT_ERR_PRIVSEP_LEN);
3246 			break;
3247 		}
3248 		idlist = imsg.data;
3249 		if (idlist->nids > GOT_IMSG_OBJ_ID_LIST_MAX_NIDS ||
3250 		    idlist->nids * sizeof(**ids) > datalen - sizeof(*idlist)) {
3251 			err = got_error(GOT_ERR_PRIVSEP_LEN);
3252 			break;
3253 		}
3254 		*nids = idlist->nids;
3255 		*ids = calloc(*nids, sizeof(**ids));
3256 		if (*ids == NULL) {
3257 			err = got_error_from_errno("calloc");
3258 			break;
3259 		}
3260 		memcpy(*ids, (uint8_t *)imsg.data + sizeof(*idlist),
3261 		    *nids * sizeof(**ids));
3262 		break;
3263 	case GOT_IMSG_OBJ_ID_LIST_DONE:
3264 		*done = 1;
3265 		break;
3266 	default:
3267 		err = got_error(GOT_ERR_PRIVSEP_MSG);
3268 		break;
3269 	}
3270 
3271 	imsg_free(&imsg);
3272 
3273 	return err;
3274 }
3275 
3276 const struct got_error *
3277 got_privsep_send_delta_reuse_req(struct imsgbuf *ibuf)
3278 {
3279 	if (imsg_compose(ibuf, GOT_IMSG_DELTA_REUSE_REQUEST, 0, 0, -1, NULL, 0)
3280 	    == -1)
3281 		return got_error_from_errno("imsg_compose DELTA_REUSE_REQUEST");
3282 
3283 	return flush_imsg(ibuf);
3284 }
3285 
3286 const struct got_error *
3287 got_privsep_send_reused_deltas(struct imsgbuf *ibuf,
3288     struct got_imsg_reused_delta *deltas, size_t ndeltas)
3289 {
3290 	const struct got_error *err = NULL;
3291 	struct ibuf *wbuf;
3292 	struct got_imsg_reused_deltas ideltas;
3293 	size_t i;
3294 
3295 	memset(&ideltas, 0, sizeof(ideltas));
3296 
3297 	if (ndeltas > GOT_IMSG_REUSED_DELTAS_MAX_NDELTAS)
3298 		return got_error(GOT_ERR_NO_SPACE);
3299 
3300 	wbuf = imsg_create(ibuf, GOT_IMSG_REUSED_DELTAS, 0, 0,
3301 	    sizeof(ideltas) + ndeltas * sizeof(*deltas));
3302 	if (wbuf == NULL) {
3303 		err = got_error_from_errno("imsg_create REUSED_DELTAS");
3304 		return err;
3305 	}
3306 
3307 	ideltas.ndeltas = ndeltas;
3308 	if (imsg_add(wbuf, &ideltas, sizeof(ideltas)) == -1)
3309 		return got_error_from_errno("imsg_add REUSED_DELTAS");
3310 
3311 	for (i = 0; i < ndeltas; i++) {
3312 		struct got_imsg_reused_delta *delta = &deltas[i];
3313 		if (imsg_add(wbuf, delta, sizeof(*delta)) == -1)
3314 			return got_error_from_errno("imsg_add REUSED_DELTAS");
3315 	}
3316 
3317 	imsg_close(ibuf, wbuf);
3318 
3319 	return flush_imsg(ibuf);
3320 }
3321 
3322 const struct got_error *
3323 got_privsep_send_reused_deltas_done(struct imsgbuf *ibuf)
3324 {
3325 	if (imsg_compose(ibuf, GOT_IMSG_DELTA_REUSE_DONE, 0, 0, -1, NULL, 0)
3326 	    == -1)
3327 		return got_error_from_errno("imsg_compose DELTA_REUSE_DONE");
3328 
3329 	return flush_imsg(ibuf);
3330 }
3331 
3332 const struct got_error *
3333 got_privsep_recv_reused_deltas(int *done, struct got_imsg_reused_delta *deltas,
3334     size_t *ndeltas, struct imsgbuf *ibuf)
3335 {
3336 	const struct got_error *err = NULL;
3337 	struct imsg imsg;
3338 	struct got_imsg_reused_deltas *ideltas;
3339 	size_t datalen;
3340 
3341 	*done = 0;
3342 	*ndeltas = 0;
3343 
3344 	err = got_privsep_recv_imsg(&imsg, ibuf, 0);
3345 	if (err)
3346 		return err;
3347 
3348 	datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
3349 	switch (imsg.hdr.type) {
3350 	case GOT_IMSG_REUSED_DELTAS:
3351 		if (datalen < sizeof(*ideltas)) {
3352 			err = got_error(GOT_ERR_PRIVSEP_LEN);
3353 			break;
3354 		}
3355 		ideltas = imsg.data;
3356 		if (ideltas->ndeltas > GOT_IMSG_OBJ_ID_LIST_MAX_NIDS ||
3357 		    ideltas->ndeltas * sizeof(*deltas) >
3358 		    datalen - sizeof(*ideltas)) {
3359 			err = got_error(GOT_ERR_PRIVSEP_LEN);
3360 			break;
3361 		}
3362 		*ndeltas = ideltas->ndeltas;
3363 		memcpy(deltas, (uint8_t *)imsg.data + sizeof(*ideltas),
3364 		    *ndeltas * sizeof(*deltas));
3365 		break;
3366 	case GOT_IMSG_DELTA_REUSE_DONE:
3367 		*done = 1;
3368 		break;
3369 	default:
3370 		err = got_error(GOT_ERR_PRIVSEP_MSG);
3371 		break;
3372 	}
3373 
3374 	imsg_free(&imsg);
3375 
3376 	return err;
3377 }
3378 
3379 const struct got_error *
3380 got_privsep_init_commit_painting(struct imsgbuf *ibuf)
3381 {
3382 	if (imsg_compose(ibuf, GOT_IMSG_COMMIT_PAINTING_INIT,
3383 	    0, 0, -1, NULL, 0)
3384 	    == -1)
3385 		return got_error_from_errno("imsg_compose "
3386 		    "COMMIT_PAINTING_INIT");
3387 
3388 	return flush_imsg(ibuf);
3389 }
3390 
3391 const struct got_error *
3392 got_privsep_send_painting_request(struct imsgbuf *ibuf, int idx,
3393     struct got_object_id *id, intptr_t color)
3394 {
3395 	struct got_imsg_commit_painting_request ireq;
3396 
3397 	memset(&ireq, 0, sizeof(ireq));
3398 	memcpy(&ireq.id, id, sizeof(ireq.id));
3399 	ireq.idx = idx;
3400 	ireq.color = color;
3401 
3402 	if (imsg_compose(ibuf, GOT_IMSG_COMMIT_PAINTING_REQUEST, 0, 0, -1,
3403 	    &ireq, sizeof(ireq)) == -1)
3404 		return got_error_from_errno("imsg_compose "
3405 		    "COMMIT_PAINTING_REQUEST");
3406 
3407 	return flush_imsg(ibuf);
3408 }
3409 
3410 static const struct got_error *
3411 send_painted_commits(struct got_object_id_queue *ids, int *nids,
3412     size_t remain, int present_in_pack, struct imsgbuf *ibuf)
3413 {
3414 	const struct got_error *err = NULL;
3415 	struct ibuf *wbuf = NULL;
3416 	struct got_object_qid *qid;
3417 	size_t msglen;
3418 	int ncommits;
3419 	intptr_t color;
3420 
3421 	msglen = MIN(remain, MAX_IMSGSIZE - IMSG_HEADER_SIZE);
3422 	ncommits = (msglen - sizeof(struct got_imsg_painted_commits)) /
3423 	    sizeof(struct got_imsg_painted_commit);
3424 
3425 	wbuf = imsg_create(ibuf, GOT_IMSG_PAINTED_COMMITS, 0, 0, msglen);
3426 	if (wbuf == NULL) {
3427 		err = got_error_from_errno("imsg_create PAINTED_COMMITS");
3428 		return err;
3429 	}
3430 
3431 	/* Keep in sync with struct got_imsg_painted_commits! */
3432 	if (imsg_add(wbuf, &ncommits, sizeof(ncommits)) == -1)
3433 		return got_error_from_errno("imsg_add PAINTED_COMMITS");
3434 	if (imsg_add(wbuf, &present_in_pack, sizeof(present_in_pack)) == -1)
3435 		return got_error_from_errno("imsg_add PAINTED_COMMITS");
3436 
3437 	while (ncommits > 0) {
3438 		qid = STAILQ_FIRST(ids);
3439 		STAILQ_REMOVE_HEAD(ids, entry);
3440 		ncommits--;
3441 		(*nids)--;
3442 		color = (intptr_t)qid->data;
3443 
3444 		/* Keep in sync with struct got_imsg_painted_commit! */
3445 		if (imsg_add(wbuf, qid->id.sha1, SHA1_DIGEST_LENGTH) == -1)
3446 			return got_error_from_errno("imsg_add PAINTED_COMMITS");
3447 		if (imsg_add(wbuf, &color, sizeof(color)) == -1)
3448 			return got_error_from_errno("imsg_add PAINTED_COMMITS");
3449 
3450 		got_object_qid_free(qid);
3451 	}
3452 
3453 	imsg_close(ibuf, wbuf);
3454 	return flush_imsg(ibuf);
3455 }
3456 
3457 const struct got_error *
3458 got_privsep_send_painted_commits(struct imsgbuf *ibuf,
3459     struct got_object_id_queue *ids, int *nids,
3460     int present_in_pack, int flush)
3461 {
3462 	const struct got_error *err;
3463 	size_t remain;
3464 
3465 	if (*nids <= 0)
3466 		return NULL;
3467 
3468 	do {
3469 		remain = (sizeof(struct got_imsg_painted_commits)) +
3470 		    *nids * sizeof(struct got_imsg_painted_commit);
3471 		if (flush || remain >= MAX_IMSGSIZE - IMSG_HEADER_SIZE) {
3472 			err = send_painted_commits(ids, nids, remain,
3473 			    present_in_pack, ibuf);
3474 			if (err)
3475 				return err;
3476 		}
3477 	} while (flush && *nids > 0);
3478 
3479 	return NULL;
3480 }
3481 
3482 const struct got_error *
3483 got_privsep_send_painting_commits_done(struct imsgbuf *ibuf)
3484 {
3485 	if (imsg_compose(ibuf, GOT_IMSG_COMMIT_PAINTING_DONE,
3486 	    0, 0, -1, NULL, 0)
3487 	    == -1)
3488 		return got_error_from_errno("imsg_compose "
3489 		    "COMMIT_PAINTING_DONE");
3490 
3491 	return flush_imsg(ibuf);
3492 }
3493 
3494 const struct got_error *
3495 got_privsep_recv_painted_commits(struct got_object_id_queue *new_ids,
3496     got_privsep_recv_painted_commit_cb cb, void *cb_arg, struct imsgbuf *ibuf)
3497 {
3498 	const struct got_error *err = NULL;
3499 	struct imsg imsg;
3500 	struct got_imsg_painted_commits icommits;
3501 	struct got_imsg_painted_commit icommit;
3502 	size_t datalen;
3503 	int i;
3504 
3505 	for (;;) {
3506 		err = got_privsep_recv_imsg(&imsg, ibuf, 0);
3507 		if (err)
3508 			return err;
3509 
3510 		datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
3511 		if (imsg.hdr.type == GOT_IMSG_COMMIT_PAINTING_DONE) {
3512 			imsg_free(&imsg);
3513 			return NULL;
3514 		}
3515 		if (imsg.hdr.type != GOT_IMSG_PAINTED_COMMITS){
3516 			imsg_free(&imsg);
3517 			return got_error(GOT_ERR_PRIVSEP_MSG);
3518 		}
3519 
3520 		if (datalen < sizeof(icommits)){
3521 			imsg_free(&imsg);
3522 			return got_error(GOT_ERR_PRIVSEP_LEN);
3523 		}
3524 		memcpy(&icommits, imsg.data, sizeof(icommits));
3525 		if (icommits.ncommits * sizeof(icommit) < icommits.ncommits ||
3526 		    datalen < sizeof(icommits) +
3527 		    icommits.ncommits * sizeof(icommit)){
3528 			imsg_free(&imsg);
3529 			return got_error(GOT_ERR_PRIVSEP_LEN);
3530 		}
3531 
3532 		for (i = 0; i < icommits.ncommits; i++) {
3533 			memcpy(&icommit,
3534 			    (uint8_t *)imsg.data + sizeof(icommits) + i * sizeof(icommit),
3535 			    sizeof(icommit));
3536 
3537 			if (icommits.present_in_pack) {
3538 				struct got_object_id id;
3539 				memcpy(id.sha1, icommit.id, SHA1_DIGEST_LENGTH);
3540 				err = cb(cb_arg, &id, icommit.color);
3541 				if (err)
3542 					break;
3543 			} else {
3544 				struct got_object_qid *qid;
3545 				err = got_object_qid_alloc_partial(&qid);
3546 				if (err)
3547 					break;
3548 				memcpy(qid->id.sha1, icommit.id,
3549 				    SHA1_DIGEST_LENGTH);
3550 				qid->data = (void *)icommit.color;
3551 				STAILQ_INSERT_TAIL(new_ids, qid, entry);
3552 			}
3553 		}
3554 
3555 		imsg_free(&imsg);
3556 		if (err)
3557 			return err;
3558 	}
3559 }
3560 
3561 const struct got_error *
3562 got_privsep_unveil_exec_helpers(void)
3563 {
3564 	const char *helpers[] = {
3565 	    GOT_PATH_PROG_READ_PACK,
3566 	    GOT_PATH_PROG_READ_OBJECT,
3567 	    GOT_PATH_PROG_READ_COMMIT,
3568 	    GOT_PATH_PROG_READ_TREE,
3569 	    GOT_PATH_PROG_READ_BLOB,
3570 	    GOT_PATH_PROG_READ_TAG,
3571 	    GOT_PATH_PROG_READ_GITCONFIG,
3572 	    GOT_PATH_PROG_READ_GOTCONFIG,
3573 	    GOT_PATH_PROG_READ_PATCH,
3574 	    GOT_PATH_PROG_FETCH_PACK,
3575 	    GOT_PATH_PROG_INDEX_PACK,
3576 	    GOT_PATH_PROG_SEND_PACK,
3577 	};
3578 	size_t i;
3579 
3580 	for (i = 0; i < nitems(helpers); i++) {
3581 		if (unveil(helpers[i], "x") == 0)
3582 			continue;
3583 		return got_error_from_errno2("unveil", helpers[i]);
3584 	}
3585 
3586 	return NULL;
3587 }
3588 
3589 void
3590 got_privsep_exec_child(int imsg_fds[2], const char *path, const char *repo_path)
3591 {
3592 	if (close(imsg_fds[0]) == -1) {
3593 		fprintf(stderr, "%s: %s\n", getprogname(), strerror(errno));
3594 		_exit(1);
3595 	}
3596 
3597 	if (dup2(imsg_fds[1], GOT_IMSG_FD_CHILD) == -1) {
3598 		fprintf(stderr, "%s: %s\n", getprogname(), strerror(errno));
3599 		_exit(1);
3600 	}
3601 
3602 	closefrom(GOT_IMSG_FD_CHILD + 1);
3603 
3604 	if (execl(path, path, repo_path, (char *)NULL) == -1) {
3605 		fprintf(stderr, "%s: %s: %s\n", getprogname(), path,
3606 		    strerror(errno));
3607 		_exit(1);
3608 	}
3609 }