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