On Wed, Sep 13, 2017 at 01:08:07PM -0400, Jeff King wrote: > Here's the fix, along with some related cleanups. The actual bugfix is > in the first patch, which I think should go to "maint". The rest are not > as important, so could go to master (but would also be fine for maint, > as there should be no user-visible changes). > > [1/7]: config: avoid "write_in_full(fd, buf, len) < len" pattern > [2/7]: get-tar-commit-id: check write_in_full() return against 0 > [3/7]: avoid "write_in_full(fd, buf, len) != len" pattern > [4/7]: convert less-trivial versions of "write_in_full() != len" > [5/7]: pkt-line: check write_in_full() errors against "< 0" > [6/7]: notes-merge: use ssize_t for write_in_full() return value > [7/7]: config: flip return value of store_write_*() Jonathan pointed out that read_in_full() can suffer from the same issue, and there is one buggy caller. A mass cleanup is a bit harder, as described in https://public-inbox.org/git/20170913183700.amtrquhg66hjrbsp@xxxxxxxxxxxxxxxxxxxxx/ so I punted on it for now. -- >8 -- Subject: [PATCH] read_pack_header: handle signed/unsigned comparison in read result The result of read_in_full() may be -1 if we saw an error. But in comparing it to a sizeof() result, that "-1" will be promoted to size_t. In fact, the largest possible size_t which is much bigger than our struct size. This means that our "< sizeof(header)" error check won't trigger. In practice, we'd go on to read uninitialized memory and compare it to the PACK signature, which is likely to fail. But we shouldn't get there. We can fix this by making a direct "!=" comparison to the requested size, rather than "<". This means that errors get lumped in with short reads, but that's sufficient for our purposes here. There's no PH_ERROR tp represent our case. And anyway, this function reads from pipes and network sockets. A network error may racily appear as EOF to us anyway if there's data left in the socket buffers. Signed-off-by: Jeff King <peff@xxxxxxxx> --- sha1_file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sha1_file.c b/sha1_file.c index 5f71bbac3e..c1c6e9021d 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -1850,7 +1850,7 @@ int index_path(struct object_id *oid, const char *path, struct stat *st, unsigne int read_pack_header(int fd, struct pack_header *header) { - if (read_in_full(fd, header, sizeof(*header)) < sizeof(*header)) + if (read_in_full(fd, header, sizeof(*header)) != sizeof(*header)) /* "eof before pack header was fully read" */ return PH_ERROR_EOF; -- 2.14.1.874.ge7b2e05270
