git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] sequencer: detect author name errors in read_author_script()

From
Junio C Hamano <gitster@pobox.com>
Date
Oct 3, 2022, 16:34 UTC
Message-ID
<xmqq8rlwx3vx.fsf@gitster.g>
In-Reply-To
<YzqhEcTDwMwa8dQX@coredump.intra.peff.net>
Jeff King <peff@peff.net> writes:
Show 36 quoted lines
> On Sun, Oct 02, 2022 at 11:39:16PM -0700, Michael V. Scovetta wrote:
>
>> 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)
>
> Agreed, but +cc Phillip as the original author.
>
>> 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.
>
> Correct. It also happens if GIT_AUTHOR_NAME is missing.
>
>> 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.
>
> It's a little tricky, because we avoid writing and reading the
> author-script file unless necessary. An easy way to need it is to break
> with a conflict (which writes it), and then resume with "git rebase
> --continue" (which reads it back while committing).
>
> Here's a patch to fix it. Thanks for your report!
And thanks for your fix ;-)
Previous: Junio C HamanoNext: Jeff King
Message 9 of 11 in “Bug Report: Duplicate condition in read_author_script (sequencer.c)”
  1. Michael V. ScovettaOct 3, 2022
  2. sequencer: detect author name errors in read_author_script()Jeff King, Oct 3, 2022
  3. Phillip WoodOct 3, 2022
  4. Jeff KingOct 3, 2022
  5. Ævar Arnfjörð BjarmasonOct 3, 2022
  6. Jeff KingOct 3, 2022
  7. Jeff KingOct 3, 2022
  8. Junio C HamanoOct 3, 2022
  9. Junio C HamanoOct 3, 2022
  10. Jeff KingOct 3, 2022
  11. Junio C HamanoOct 3, 2022

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.