Commit ddc7b220d2cafa2ab2e485c71a7a4cbfa9c23beb
2019-09-08T18:29:14
do not leak ibuf in error paths of read_*_privsep()
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224
diff --git a/lib/object.c b/lib/object.c
index ca9b147..7f69adc 100644
--- a/lib/object.c
+++ b/lib/object.c
@@ -350,6 +350,7 @@ static const struct got_error *
read_object_header_privsep(struct got_object **obj, struct got_repository *repo,
int obj_fd)
{
+ const struct got_error *err;
int imsg_fds[2];
pid_t pid;
struct imsgbuf *ibuf;
@@ -361,20 +362,29 @@ read_object_header_privsep(struct got_object **obj, struct got_repository *repo,
if (ibuf == NULL)
return got_error_from_errno("calloc");
- if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, imsg_fds) == -1)
- return got_error_from_errno("socketpair");
+ if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, imsg_fds) == -1) {
+ err = got_error_from_errno("socketpair");
+ free(ibuf);
+ return err;
+ }
pid = fork();
- if (pid == -1)
- return got_error_from_errno("fork");
+ if (pid == -1) {
+ err = got_error_from_errno("fork");
+ free(ibuf);
+ return err;
+ }
else if (pid == 0) {
got_privsep_exec_child(imsg_fds, GOT_PATH_PROG_READ_OBJECT,
repo->path);
/* not reached */
}
- if (close(imsg_fds[1]) != 0)
- return got_error_from_errno("close");
+ if (close(imsg_fds[1]) != 0) {
+ err = got_error_from_errno("close");
+ free(ibuf);
+ return err;
+ }
repo->privsep_children[GOT_REPO_PRIVSEP_CHILD_OBJECT].imsg_fd =
imsg_fds[0];
repo->privsep_children[GOT_REPO_PRIVSEP_CHILD_OBJECT].pid = pid;
@@ -515,6 +525,7 @@ static const struct got_error *
read_commit_privsep(struct got_commit_object **commit, int obj_fd,
struct got_repository *repo)
{
+ const struct got_error *err;
int imsg_fds[2];
pid_t pid;
struct imsgbuf *ibuf;
@@ -526,20 +537,29 @@ read_commit_privsep(struct got_commit_object **commit, int obj_fd,
if (ibuf == NULL)
return got_error_from_errno("calloc");
- if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, imsg_fds) == -1)
- return got_error_from_errno("socketpair");
+ if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, imsg_fds) == -1) {
+ err = got_error_from_errno("socketpair");
+ free(ibuf);
+ return err;
+ }
pid = fork();
- if (pid == -1)
- return got_error_from_errno("fork");
+ if (pid == -1) {
+ err = got_error_from_errno("fork");
+ free(ibuf);
+ return err;
+ }
else if (pid == 0) {
got_privsep_exec_child(imsg_fds, GOT_PATH_PROG_READ_COMMIT,
repo->path);
/* not reached */
}
- if (close(imsg_fds[1]) != 0)
- return got_error_from_errno("close");
+ if (close(imsg_fds[1]) != 0) {
+ err = got_error_from_errno("close");
+ free(ibuf);
+ return err;
+ }
repo->privsep_children[GOT_REPO_PRIVSEP_CHILD_COMMIT].imsg_fd =
imsg_fds[0];
repo->privsep_children[GOT_REPO_PRIVSEP_CHILD_COMMIT].pid = pid;
@@ -694,6 +714,7 @@ const struct got_error *
read_tree_privsep(struct got_tree_object **tree, int obj_fd,
struct got_repository *repo)
{
+ const struct got_error *err;
int imsg_fds[2];
pid_t pid;
struct imsgbuf *ibuf;
@@ -705,20 +726,29 @@ read_tree_privsep(struct got_tree_object **tree, int obj_fd,
if (ibuf == NULL)
return got_error_from_errno("calloc");
- if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, imsg_fds) == -1)
- return got_error_from_errno("socketpair");
+ if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, imsg_fds) == -1) {
+ err = got_error_from_errno("socketpair");
+ free(ibuf);
+ return err;
+ }
pid = fork();
- if (pid == -1)
- return got_error_from_errno("fork");
+ if (pid == -1) {
+ err = got_error_from_errno("fork");
+ free(ibuf);
+ return err;
+ }
else if (pid == 0) {
got_privsep_exec_child(imsg_fds, GOT_PATH_PROG_READ_TREE,
repo->path);
/* not reached */
}
- if (close(imsg_fds[1]) != 0)
- return got_error_from_errno("close");
+ if (close(imsg_fds[1]) != 0) {
+ err = got_error_from_errno("close");
+ free(ibuf);
+ return err;
+ }
repo->privsep_children[GOT_REPO_PRIVSEP_CHILD_TREE].imsg_fd =
imsg_fds[0];
repo->privsep_children[GOT_REPO_PRIVSEP_CHILD_TREE].pid = pid;
@@ -913,6 +943,7 @@ static const struct got_error *
read_blob_privsep(uint8_t **outbuf, size_t *size, size_t *hdrlen,
int outfd, int infd, struct got_repository *repo)
{
+ const struct got_error *err;
int imsg_fds[2];
pid_t pid;
struct imsgbuf *ibuf;
@@ -926,20 +957,29 @@ read_blob_privsep(uint8_t **outbuf, size_t *size, size_t *hdrlen,
if (ibuf == NULL)
return got_error_from_errno("calloc");
- if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, imsg_fds) == -1)
- return got_error_from_errno("socketpair");
+ if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, imsg_fds) == -1) {
+ err = got_error_from_errno("socketpair");
+ free(ibuf);
+ return err;
+ }
pid = fork();
- if (pid == -1)
- return got_error_from_errno("fork");
+ if (pid == -1) {
+ err = got_error_from_errno("fork");
+ free(ibuf);
+ return err;
+ }
else if (pid == 0) {
got_privsep_exec_child(imsg_fds, GOT_PATH_PROG_READ_BLOB,
repo->path);
/* not reached */
}
- if (close(imsg_fds[1]) != 0)
- return got_error_from_errno("close");
+ if (close(imsg_fds[1]) != 0) {
+ err = got_error_from_errno("close");
+ free(ibuf);
+ return err;
+ }
repo->privsep_children[GOT_REPO_PRIVSEP_CHILD_BLOB].imsg_fd =
imsg_fds[0];
repo->privsep_children[GOT_REPO_PRIVSEP_CHILD_BLOB].pid = pid;
@@ -1251,6 +1291,7 @@ static const struct got_error *
read_tag_privsep(struct got_tag_object **tag, int obj_fd,
struct got_repository *repo)
{
+ const struct got_error *err;
int imsg_fds[2];
pid_t pid;
struct imsgbuf *ibuf;
@@ -1262,20 +1303,29 @@ read_tag_privsep(struct got_tag_object **tag, int obj_fd,
if (ibuf == NULL)
return got_error_from_errno("calloc");
- if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, imsg_fds) == -1)
- return got_error_from_errno("socketpair");
+ if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, imsg_fds) == -1) {
+ err = got_error_from_errno("socketpair");
+ free(ibuf);
+ return err;
+ }
pid = fork();
- if (pid == -1)
- return got_error_from_errno("fork");
+ if (pid == -1) {
+ err = got_error_from_errno("fork");
+ free(ibuf);
+ return err;
+ }
else if (pid == 0) {
got_privsep_exec_child(imsg_fds, GOT_PATH_PROG_READ_TAG,
repo->path);
/* not reached */
}
- if (close(imsg_fds[1]) != 0)
- return got_error_from_errno("close");
+ if (close(imsg_fds[1]) != 0) {
+ err = got_error_from_errno("close");
+ free(ibuf);
+ return err;
+ }
repo->privsep_children[GOT_REPO_PRIVSEP_CHILD_TAG].imsg_fd =
imsg_fds[0];
repo->privsep_children[GOT_REPO_PRIVSEP_CHILD_TAG].pid = pid;