Commit faaa1c0fd279a45c741fd87aa9369924976c886b
2018-09-15T20:05:47
handle errors from read(2) better while reading pack files
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
diff --git a/lib/pack.c b/lib/pack.c
index a673172..4d61efe 100644
--- a/lib/pack.c
+++ b/lib/pack.c
@@ -137,7 +137,9 @@ got_packidx_init_hdr(struct got_packidx *p, int verify)
goto done;
}
n = read(p->fd, h->magic, sizeof(*h->magic));
- if (n != sizeof(*h->magic)) {
+ if (n < 0)
+ err = got_error_from_errno();
+ else if (n != sizeof(*h->magic)) {
err = got_error(GOT_ERR_BAD_PACKIDX);
goto done;
}
@@ -165,7 +167,9 @@ got_packidx_init_hdr(struct got_packidx *p, int verify)
goto done;
}
n = read(p->fd, h->version, sizeof(*h->version));
- if (n != sizeof(*h->version)) {
+ if (n < 0)
+ err = got_error_from_errno();
+ else if (n != sizeof(*h->version)) {
err = got_error(GOT_ERR_BAD_PACKIDX);
goto done;
}
@@ -195,7 +199,9 @@ got_packidx_init_hdr(struct got_packidx *p, int verify)
goto done;
}
n = read(p->fd, h->fanout_table, len_fanout);
- if (n != len_fanout) {
+ if (n < 0)
+ err = got_error_from_errno();
+ else if (n != len_fanout) {
err = got_error(GOT_ERR_BAD_PACKIDX);
goto done;
}
@@ -224,7 +230,9 @@ got_packidx_init_hdr(struct got_packidx *p, int verify)
goto done;
}
n = read(p->fd, h->sorted_ids, len_ids);
- if (n != len_ids) {
+ if (n < 0)
+ err = got_error_from_errno();
+ else if (n != len_ids) {
err = got_error(GOT_ERR_BAD_PACKIDX);
goto done;
}
@@ -247,7 +255,9 @@ got_packidx_init_hdr(struct got_packidx *p, int verify)
goto done;
}
n = read(p->fd, h->crc32, nobj * sizeof(*h->crc32));
- if (n != nobj * sizeof(*h->crc32)) {
+ if (n < 0)
+ err = got_error_from_errno();
+ else if (n != nobj * sizeof(*h->crc32)) {
err = got_error(GOT_ERR_BAD_PACKIDX);
goto done;
}
@@ -270,7 +280,9 @@ got_packidx_init_hdr(struct got_packidx *p, int verify)
goto done;
}
n = read(p->fd, h->offsets, nobj * sizeof(*h->offsets));
- if (n != nobj * sizeof(*h->offsets)) {
+ if (n < 0)
+ err = got_error_from_errno();
+ else if (n != nobj * sizeof(*h->offsets)) {
err = got_error(GOT_ERR_BAD_PACKIDX);
goto done;
}
@@ -299,7 +311,9 @@ got_packidx_init_hdr(struct got_packidx *p, int verify)
}
n = read(p->fd, h->large_offsets,
nobj * sizeof(*h->large_offsets));
- if (n != nobj * sizeof(*h->large_offsets)) {
+ if (n < 0)
+ err = got_error_from_errno();
+ else if (n != nobj * sizeof(*h->large_offsets)) {
err = got_error(GOT_ERR_BAD_PACKIDX);
goto done;
}
@@ -325,7 +339,9 @@ checksum:
goto done;
}
n = read(p->fd, h->trailer, sizeof(*h->trailer));
- if (n != sizeof(*h->trailer)) {
+ if (n < 0)
+ err = got_error_from_errno();
+ else if (n != sizeof(*h->trailer)) {
err = got_error(GOT_ERR_BAD_PACKIDX);
goto done;
}