From: Eric Sunshine <sunshine@sunshineco.com>
To: git@vger.kernel.org
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Eric Sunshine <sunshine@sunshineco.com>
Subject: [PATCH] color: protect against out-of-bounds array access/assignment
Date: Thu, 2 Aug 2018 05:32:08 -0400 [thread overview]
Message-ID: <20180802093208.27420-1-sunshine@sunshineco.com> (raw)
want_color_fd() is designed to work only with standard input, output,
and error file descriptors, and stores information about each descriptor
in an array. However, it doesn't verify that the passed-in descriptor
lives within that set, which, with a buggy caller, could lead to
access/assignment outside the array bounds.
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
---
Just something I noticed while studying this code in relation to a patch
review.
color.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/color.c b/color.c
index b1c24c69de..b0be9ce505 100644
--- a/color.c
+++ b/color.c
@@ -343,6 +343,9 @@ int want_color_fd(int fd, int var)
static int want_auto[3] = { -1, -1, -1 };
+ if (fd < 0 || fd >= ARRAY_SIZE(want_auto))
+ BUG("file descriptor out of range: %d", fd);
+
if (var < 0)
var = git_use_color_default;
--
2.18.0.599.g4ce2a8faa4.dirty
next reply other threads:[~2018-08-02 9:32 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-02 9:32 Eric Sunshine [this message]
2018-08-02 12:38 ` [PATCH] color: protect against out-of-bounds array access/assignment Johannes Schindelin
2018-08-02 17:36 ` Junio C Hamano
2018-08-02 17:45 ` Eric Sunshine
2018-08-02 19:24 ` Junio C Hamano
2018-08-02 19:30 ` Jeff King
2018-08-03 6:07 ` Jonathan Nieder
2018-08-03 6:43 ` Eric Sunshine
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=20180802093208.27420-1-sunshine@sunshineco.com \
--to=sunshine@sunshineco.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
/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).