From: "Michael V. Scovetta" <michael.scovetta@gmail.com>
To: git@vger.kernel.org
Subject: Bug Report: Duplicate condition in read_author_script (sequencer.c)
Date: Sun, 2 Oct 2022 23:39:16 -0700 [thread overview]
Message-ID: <CADG3Mza_QU+ceTUsMYxJ3PzsEqi8M98oOBAzzz0GHRJ-F7vkpA@mail.gmail.com> (raw)
Hello!
I noticed a duplicate condition in the read_author_script function
defined in sequencer.c. I reported this initially to the security
mailing list, but folks there thought it was unlikely to be
interesting from a security perspective, and advised me to report it
here.
In commit 2a7d63a2, sequencer.c:912 looks like:
912 if (name_i == -2)
913 error(_("missing 'GIT_AUTHOR_NAME'"));
914 if (email_i == -2)
915 error(_("missing 'GIT_AUTHOR_EMAIL'"));
916 if (date_i == -2)
917 error(_("missing 'GIT_AUTHOR_DATE'"));
918 if (date_i < 0 || email_i < 0 || date_i < 0 || err) <-- date_i
is referenced here twice
919 goto finish;
I'm fairly sure that line 918 should be:
918 if (name_i < 0 || email_i < 0 || date_i < 0 || err)
I haven't validated this, but I suspect that if
`rebase-merge/author-script` contained two GIT_AUTHOR_NAME fields,
then name_i would be set to -1 (by the error function), but control
wouldn't flow to finish, but instead to line 920 ( *name =
kv.items[name_i].util; ) where it would attempt to access memory
slightly outside of items' memory space.
I haven't been able to actually trigger the bug, but strongly suspect
I'm just not familiar enough with how rebasing works under the covers.
I can dig into this deeper if you'd like, but it looks like an obvious
typo or copy/paste error. Is this something that a maintainer would be
able to take from here?
Thanks so much!!
Mike
next reply other threads:[~2022-10-03 6:40 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-03 6:39 Michael V. Scovetta [this message]
2022-10-03 8:45 ` [PATCH] sequencer: detect author name errors in read_author_script() Jeff King
2022-10-03 9:29 ` Phillip Wood
2022-10-03 17:15 ` Jeff King
2022-10-03 9:40 ` Ævar Arnfjörð Bjarmason
2022-10-03 17:27 ` Jeff King
2022-10-03 17:39 ` Jeff King
2022-10-03 18:05 ` Junio C Hamano
2022-10-03 16:34 ` Junio C Hamano
2022-10-03 17:35 ` Jeff King
2022-10-03 18:07 ` 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=CADG3Mza_QU+ceTUsMYxJ3PzsEqi8M98oOBAzzz0GHRJ-F7vkpA@mail.gmail.com \
--to=michael.scovetta@gmail.com \
--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).