From: Junio C Hamano <gitster@pobox.com>
To: "Phillip Wood via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, "Kyle J. McKay" <mackyle@gmail.com>,
Phillip Wood <phillip.wood@dunelm.org.uk>
Subject: Re: [PATCH] mailinfo -b: fix an out of bounds access
Date: Mon, 03 Oct 2022 09:02:09 -0700 [thread overview]
Message-ID: <xmqq8rlwyjy6.fsf@gitster.g> (raw)
In-Reply-To: <pull.1372.git.1664789011089.gitgitgadget@gmail.com> (Phillip Wood via GitGitGadget's message of "Mon, 03 Oct 2022 09:23:30 +0000")
"Phillip Wood via GitGitGadget" <gitgitgadget@gmail.com> writes:
> We have tests that trigger this bug that were added in ae52d57f0b
> (t5100: add some more mailinfo tests, 2017-05-31). The commit message
> mentions that they are marked test_expect_failure as they trigger an
> assertion in strbuf_splice(). While it is reassuring that
> strbuf_splice() detects the problem and dies in retrospect that should
> perhaps have warranted a little more investigation.
Indeed.
> diff --git a/mailinfo.c b/mailinfo.c
> index 9621ba62a39..833d28612f7 100644
> --- a/mailinfo.c
> +++ b/mailinfo.c
> @@ -317,7 +317,7 @@ static void cleanup_subject(struct mailinfo *mi, struct strbuf *subject)
> pos = strchr(subject->buf + at, ']');
> if (!pos)
> break;
> - remove = pos - subject->buf + at + 1;
> + remove = pos - (subject->buf + at) + 1;
How embarrassing.
It really is (&pos[1] - &subject->buf[at]), subtracting from the
address of one past the closing ']' and the address of opening '[',
so the rewrite is correct.
Thanks.
> diff --git a/t/t5100-mailinfo.sh b/t/t5100-mailinfo.sh
> index cebad1048cf..db11cababd3 100755
> --- a/t/t5100-mailinfo.sh
> +++ b/t/t5100-mailinfo.sh
> @@ -201,13 +201,13 @@ test_expect_success 'mailinfo -b double [PATCH]' '
> test z"$subj" = z"Subject: message"
> '
>
> -test_expect_failure 'mailinfo -b trailing [PATCH]' '
> +test_expect_success 'mailinfo -b trailing [PATCH]' '
> subj="$(echo "Subject: [other] [PATCH] message" |
> git mailinfo -b /dev/null /dev/null)" &&
> test z"$subj" = z"Subject: [other] message"
> '
>
> -test_expect_failure 'mailinfo -b separated double [PATCH]' '
> +test_expect_success 'mailinfo -b separated double [PATCH]' '
> subj="$(echo "Subject: [PATCH] [other] [PATCH] message" |
> git mailinfo -b /dev/null /dev/null)" &&
> test z"$subj" = z"Subject: [other] message"
>
> base-commit: dda7228a83e2e9ff584bf6adbf55910565b41e14
prev parent reply other threads:[~2022-10-03 16:02 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-03 9:23 [PATCH] mailinfo -b: fix an out of bounds access Phillip Wood via GitGitGadget
2022-10-03 16:02 ` Junio C Hamano [this message]
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=xmqq8rlwyjy6.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=mackyle@gmail.com \
--cc=phillip.wood@dunelm.org.uk \
/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).