Game of Trees Repos

Blame

Date:: Tue Jan 30 11:25:08 2024 UTC
Message:: convert to use imsg_get_fd() While here also fix a fd leak in got-read-pack. We were dup'ing imsg.fd without closing imsg.fd later; instead just use imsg_get_fd() to extract the file descriptor. Tested by falsifian and Kyle Ackerman, thanks! 'go ahead' stsp@
Actions:: History | Blob | Raw File
  1 28714985 2018-11-17 stsp /*
  2 28714985 2018-11-17 stsp  * Copyright (c) 2018 Stefan Sperling <stsp@openbsd.org>
  3 28714985 2018-11-17 stsp  *
  4 28714985 2018-11-17 stsp  * Permission to use, copy, modify, and distribute this software for any
  5 28714985 2018-11-17 stsp  * purpose with or without fee is hereby granted, provided that the above
  6 28714985 2018-11-17 stsp  * copyright notice and this permission notice appear in all copies.
  7 28714985 2018-11-17 stsp  *
  8 28714985 2018-11-17 stsp  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  9 28714985 2018-11-17 stsp  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
 10 28714985 2018-11-17 stsp  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
 11 28714985 2018-11-17 stsp  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
 12 28714985 2018-11-17 stsp  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 13 28714985 2018-11-17 stsp  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 14 28714985 2018-11-17 stsp  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 15 28714985 2018-11-17 stsp  */
 16 28714985 2018-11-17 stsp 
 17 28714985 2018-11-17 stsp #include <sys/types.h>
 18 28714985 2018-11-17 stsp #include <sys/queue.h>
 19 28714985 2018-11-17 stsp #include <sys/uio.h>
 20 28714985 2018-11-17 stsp #include <sys/time.h>
 21 28714985 2018-11-17 stsp 
 22 28714985 2018-11-17 stsp #include <stdint.h>
 23 28714985 2018-11-17 stsp #include <imsg.h>
 24 12ce7a6c 2019-08-12 stsp #include <limits.h>
 25 28714985 2018-11-17 stsp #include <signal.h>
 26 28714985 2018-11-17 stsp #include <stdio.h>
 27 28714985 2018-11-17 stsp #include <stdlib.h>
 28 28714985 2018-11-17 stsp #include <string.h>
 29 28714985 2018-11-17 stsp #include <sha1.h>
 30 5822e79e 2023-02-23 op #include <sha2.h>
 31 81a12da5 2020-09-09 naddy #include <unistd.h>
 32 28714985 2018-11-17 stsp #include <zlib.h>
 33 28714985 2018-11-17 stsp 
 34 28714985 2018-11-17 stsp #include "got_error.h"
 35 28714985 2018-11-17 stsp #include "got_object.h"
 36 28714985 2018-11-17 stsp 
 37 28714985 2018-11-17 stsp #include "got_lib_delta.h"
 38 28714985 2018-11-17 stsp #include "got_lib_inflate.h"
 39 28714985 2018-11-17 stsp #include "got_lib_object.h"
 40 28714985 2018-11-17 stsp #include "got_lib_object_parse.h"
 41 28714985 2018-11-17 stsp #include "got_lib_privsep.h"
 42 53bf0b54 2023-02-23 op #include "got_lib_hash.h"
 43 28714985 2018-11-17 stsp 
 44 28714985 2018-11-17 stsp static volatile sig_atomic_t sigint_received;
 45 28714985 2018-11-17 stsp 
 46 28714985 2018-11-17 stsp static void
 47 28714985 2018-11-17 stsp catch_sigint(int signo)
 48 28714985 2018-11-17 stsp {
 49 28714985 2018-11-17 stsp 	sigint_received = 1;
 50 28714985 2018-11-17 stsp }
 51 28714985 2018-11-17 stsp 
 52 28714985 2018-11-17 stsp int
 53 28714985 2018-11-17 stsp main(int argc, char *argv[])
 54 28714985 2018-11-17 stsp {
 55 28714985 2018-11-17 stsp 	const struct got_error *err = NULL;
 56 28714985 2018-11-17 stsp 	struct imsgbuf ibuf;
 57 d5c81d44 2021-07-08 stsp 	size_t datalen;
 58 28714985 2018-11-17 stsp 
 59 28714985 2018-11-17 stsp 	signal(SIGINT, catch_sigint);
 60 28714985 2018-11-17 stsp 
 61 28714985 2018-11-17 stsp 	imsg_init(&ibuf, GOT_IMSG_FD_CHILD);
 62 28714985 2018-11-17 stsp 
 63 28714985 2018-11-17 stsp #ifndef PROFILE
 64 28714985 2018-11-17 stsp 	/* revoke access to most system calls */
 65 28714985 2018-11-17 stsp 	if (pledge("stdio recvfd", NULL) == -1) {
 66 638f9024 2019-05-13 stsp 		err = got_error_from_errno("pledge");
 67 28714985 2018-11-17 stsp 		got_privsep_send_error(&ibuf, err);
 68 28714985 2018-11-17 stsp 		return 1;
 69 28714985 2018-11-17 stsp 	}
 70 28714985 2018-11-17 stsp #endif
 71 28714985 2018-11-17 stsp 
 72 656b1f76 2019-05-11 jcs 	for (;;) {
 73 28714985 2018-11-17 stsp 		struct imsg imsg;
 74 268f7291 2018-12-24 stsp 		struct got_tag_object *tag = NULL;
 75 d5c81d44 2021-07-08 stsp 		struct got_object_id expected_id;
 76 2c52c623 2024-01-30 op 		int fd = -1;
 77 28714985 2018-11-17 stsp 
 78 28714985 2018-11-17 stsp 		if (sigint_received) {
 79 28714985 2018-11-17 stsp 			err = got_error(GOT_ERR_CANCELLED);
 80 28714985 2018-11-17 stsp 			break;
 81 28714985 2018-11-17 stsp 		}
 82 28714985 2018-11-17 stsp 
 83 28714985 2018-11-17 stsp 		err = got_privsep_recv_imsg(&imsg, &ibuf, 0);
 84 28714985 2018-11-17 stsp 		if (err) {
 85 28714985 2018-11-17 stsp 			if (err->code == GOT_ERR_PRIVSEP_PIPE)
 86 28714985 2018-11-17 stsp 				err = NULL;
 87 28714985 2018-11-17 stsp 			break;
 88 28714985 2018-11-17 stsp 		}
 89 28714985 2018-11-17 stsp 
 90 28714985 2018-11-17 stsp 		if (imsg.hdr.type == GOT_IMSG_STOP)
 91 28714985 2018-11-17 stsp 			break;
 92 28714985 2018-11-17 stsp 
 93 28714985 2018-11-17 stsp 		if (imsg.hdr.type != GOT_IMSG_TAG_REQUEST) {
 94 28714985 2018-11-17 stsp 			err = got_error(GOT_ERR_PRIVSEP_MSG);
 95 28714985 2018-11-17 stsp 			goto done;
 96 28714985 2018-11-17 stsp 		}
 97 28714985 2018-11-17 stsp 
 98 d5c81d44 2021-07-08 stsp 		datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
 99 d5c81d44 2021-07-08 stsp 		if (datalen != sizeof(expected_id)) {
100 d5c81d44 2021-07-08 stsp 			err = got_error(GOT_ERR_PRIVSEP_LEN);
101 d5c81d44 2021-07-08 stsp 			goto done;
102 d5c81d44 2021-07-08 stsp 		}
103 d5c81d44 2021-07-08 stsp 		memcpy(&expected_id, imsg.data, sizeof(expected_id));
104 d5c81d44 2021-07-08 stsp 
105 2c52c623 2024-01-30 op 		fd = imsg_get_fd(&imsg);
106 2c52c623 2024-01-30 op 		if (fd == -1) {
107 28714985 2018-11-17 stsp 			err = got_error(GOT_ERR_PRIVSEP_NO_FD);
108 28714985 2018-11-17 stsp 			goto done;
109 28714985 2018-11-17 stsp 		}
110 28714985 2018-11-17 stsp 
111 28714985 2018-11-17 stsp 		/* Always assume file offset zero. */
112 2c52c623 2024-01-30 op 		err = got_object_read_tag(&tag, fd, &expected_id, 0);
113 28714985 2018-11-17 stsp 		if (err)
114 28714985 2018-11-17 stsp 			goto done;
115 28714985 2018-11-17 stsp 
116 28714985 2018-11-17 stsp 		err = got_privsep_send_tag(&ibuf, tag);
117 28714985 2018-11-17 stsp done:
118 2c52c623 2024-01-30 op 		if (fd != -1 && close(fd) == -1 && err == NULL)
119 13b2bc37 2022-10-23 stsp 			err = got_error_from_errno("close");
120 28714985 2018-11-17 stsp 		imsg_free(&imsg);
121 28714985 2018-11-17 stsp 		if (err)
122 28714985 2018-11-17 stsp 			break;
123 28714985 2018-11-17 stsp 	}
124 28714985 2018-11-17 stsp 
125 28714985 2018-11-17 stsp 	imsg_clear(&ibuf);
126 28714985 2018-11-17 stsp 	if (err) {
127 28714985 2018-11-17 stsp 		if (!sigint_received && err->code != GOT_ERR_PRIVSEP_PIPE) {
128 28714985 2018-11-17 stsp 			fprintf(stderr, "%s: %s\n", getprogname(), err->msg);
129 28714985 2018-11-17 stsp 			got_privsep_send_error(&ibuf, err);
130 28714985 2018-11-17 stsp 		}
131 28714985 2018-11-17 stsp 	}
132 08578a35 2021-01-22 stsp 	if (close(GOT_IMSG_FD_CHILD) == -1 && err == NULL)
133 638f9024 2019-05-13 stsp 		err = got_error_from_errno("close");
134 28714985 2018-11-17 stsp 	return err ? 1 : 0;
135 28714985 2018-11-17 stsp }