git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Jeff King <peff@peff.net>
To: git@vger.kernel.org
Cc: Jonathan Nieder <jrnieder@gmail.com>
Subject: [PATCH 5/7] worktree: use xsize_t to access file size
Date: Mon, 25 Sep 2017 16:30:34 -0400	[thread overview]
Message-ID: <20170925203033.z4czmuhedm3f54b3@sigill.intra.peff.net> (raw)
In-Reply-To: <20170925202646.agsnpmar3dzocdcr@sigill.intra.peff.net>

To read the "gitdir" file into memory, we stat the file and
allocate a buffer. But we store the size in an "int", which
may be truncated. We should use a size_t and xsize_t(),
which will detect truncation.

An overflow is unlikely for a "gitdir" file, but it's a good
practice to model.

Signed-off-by: Jeff King <peff@peff.net>
---
 builtin/worktree.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/builtin/worktree.c b/builtin/worktree.c
index de26849f55..2f4a4ef9cd 100644
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@ -38,7 +38,8 @@ static int prune_worktree(const char *id, struct strbuf *reason)
 {
 	struct stat st;
 	char *path;
-	int fd, len;
+	int fd;
+	size_t len;
 
 	if (!is_directory(git_path("worktrees/%s", id))) {
 		strbuf_addf(reason, _("Removing worktrees/%s: not a valid directory"), id);
@@ -56,7 +57,7 @@ static int prune_worktree(const char *id, struct strbuf *reason)
 			    id, strerror(errno));
 		return 1;
 	}
-	len = st.st_size;
+	len = xsize_t(st.st_size);
 	path = xmallocz(len);
 	read_in_full(fd, path, len);
 	close(fd);
-- 
2.14.1.1148.ga2561536a1


  parent reply	other threads:[~2017-09-25 20:30 UTC|newest]

Thread overview: 51+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-09-25 20:26 [PATCH 0/7] read/write_in_full leftovers Jeff King
2017-09-25 20:27 ` [PATCH 1/7] files-backend: prefer "0" for write_in_full() error check Jeff King
2017-09-25 21:59   ` Jonathan Nieder
2017-09-25 23:13     ` Jeff King
2017-09-25 20:27 ` [PATCH 2/7] notes-merge: drop dead zero-write code Jeff King
2017-09-25 21:59   ` Jonathan Nieder
2017-09-25 20:29 ` [PATCH 3/7] read_in_full: reset errno before reading Jeff King
2017-09-25 22:09   ` Jonathan Nieder
2017-09-25 23:23     ` Jeff King
2017-09-25 23:33       ` Jonathan Nieder
2017-09-25 23:37         ` Jeff King
2017-09-25 23:45           ` Jeff King
2017-09-25 23:55             ` Jonathan Nieder
2017-09-26  0:01               ` Jeff King
2017-09-26  0:06                 ` Stefan Beller
2017-09-26  0:09                   ` Jeff King
2017-09-26  0:16                     ` Jonathan Nieder
2017-09-26  0:17                       ` Jonathan Nieder
2017-09-26  0:19                         ` Jeff King
2017-09-26  0:22                           ` Jonathan Nieder
2017-09-26  4:11                           ` Junio C Hamano
2017-09-27  4:07                             ` Jeff King
2017-09-27  4:27                               ` Junio C Hamano
2017-09-26  0:13                 ` Jonathan Nieder
2017-09-26  0:17                   ` Jeff King
2017-09-26  0:20                     ` Jonathan Nieder
2017-09-26  0:25                       ` Jeff King
2017-09-26  0:28                         ` Jonathan Nieder
2017-09-25 23:52           ` Jonathan Nieder
2017-09-25 20:29 ` [PATCH 4/7] get-tar-commit-id: prefer "!=" for read_in_full() error check Jeff King
2017-09-25 22:10   ` Jonathan Nieder
2017-09-25 20:30 ` Jeff King [this message]
2017-09-25 22:11   ` [PATCH 5/7] worktree: use xsize_t to access file size Jonathan Nieder
2017-09-25 20:31 ` [PATCH 6/7] worktree: check the result of read_in_full() Jeff King
2017-09-25 22:14   ` Jonathan Nieder
2017-09-25 23:25     ` Jeff King
2017-09-25 20:33 ` [PATCH 7/7] add xread_in_full() helper Jeff King
2017-09-25 22:16   ` Jonathan Nieder
2017-09-25 23:27     ` Jeff King
2017-09-27  5:54 ` [PATCH v2 0/7] read/write_in_full leftovers Jeff King
2017-09-27  6:00   ` [PATCH v2 1/7] files-backend: prefer "0" for write_in_full() error check Jeff King
2017-09-27  6:00   ` [PATCH v2 2/7] notes-merge: drop dead zero-write code Jeff King
2017-09-27  6:00   ` [PATCH v2 3/7] prefer "!=" when checking read_in_full() result Jeff King
2017-09-27  6:59     ` Junio C Hamano
2017-09-27  7:09       ` Jeff King
2017-09-27  6:01   ` [PATCH v2 4/7] avoid looking at errno for short read_in_full() returns Jeff King
2017-09-27  6:59     ` Junio C Hamano
2017-09-27  6:02   ` [PATCH v2 5/7] distinguish error versus short read from read_in_full() Jeff King
2017-09-27  6:02   ` [PATCH v2 6/7] worktree: use xsize_t to access file size Jeff King
2017-09-27  6:02   ` [PATCH v2 7/7] worktree: check the result of read_in_full() Jeff King
2017-09-27  6:57   ` [PATCH v2 0/7] read/write_in_full leftovers Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170925203033.z4czmuhedm3f54b3@sigill.intra.peff.net \
    --to=peff@peff.net \
    --cc=git@vger.kernel.org \
    --cc=jrnieder@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).