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