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