From: Jeff King <peff@peff.net>
To: git@vger.kernel.org
Cc: Michael Haggerty <mhagger@alum.mit.edu>
Subject: [PATCH 0/2] fix read past end of array in alternates files
Date: Mon, 18 Sep 2017 11:51:00 -0400 [thread overview]
Message-ID: <20170918155059.54f7z6cnrl47f5el@sigill.intra.peff.net> (raw)
This series fixes a regression in v2.11.1 where we might read past the
end of an mmap'd buffer. It was introduced in cf3c635210, but I didn't
base the patch on there, for a few reasons:
1. There's a trivial conflict when merging up (because of
git_open_noatime() becoming just git_open() in the inerim).
2. The reproduction advice relies on our SANITIZE Makefile knob, which
didn't exist back then.
3. The second patch does not apply there because we don't have
warn_on_fopen_errors(). Though admittedly it could be applied
separately after merging up; it's just a clean-up on top.
It does apply on the current "maint".
[1/2]: read_info_alternates: read contents into strbuf
[2/2]: read_info_alternates: warn on non-trivial errors
sha1_file.c | 30 ++++++++++--------------------
1 file changed, 10 insertions(+), 20 deletions(-)
-Peff
next reply other threads:[~2017-09-18 15:51 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-18 15:51 Jeff King [this message]
2017-09-18 15:54 ` [PATCH 1/2] read_info_alternates: read contents into strbuf Jeff King
2017-09-19 0:08 ` Junio C Hamano
2017-09-19 2:42 ` Jonathan Nieder
2017-09-19 5:03 ` Jeff King
2017-09-18 15:55 ` [PATCH 2/2] read_info_alternates: warn on non-trivial errors Jeff King
2017-09-19 2:46 ` Jonathan Nieder
2017-09-19 5:15 ` Jeff King
2017-09-19 2:36 ` [PATCH 0/2] fix read past end of array in alternates files Jonathan Nieder
2017-09-19 4:57 ` Jeff King
2017-09-19 19:40 ` [PATCH v2 " Jeff King
2017-09-19 19:41 ` [PATCH v2 1/2] read_info_alternates: read contents into strbuf Jeff King
2017-09-19 19:41 ` [PATCH v2 2/2] read_info_alternates: warn on non-trivial errors Jeff King
2017-09-20 2:44 ` [PATCH v2 0/2] fix read past end of array in alternates files 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=20170918155059.54f7z6cnrl47f5el@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=mhagger@alum.mit.edu \
/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).