* [Outreachy] [PATCH v2] bisect--helper: avoid free-after-use
@ 2019-12-09 10:39 Miriam Rubio
2019-12-11 17:17 ` Junio C Hamano
0 siblings, 1 reply; 6+ messages in thread
From: Miriam Rubio @ 2019-12-09 10:39 UTC (permalink / raw)
To: git; +Cc: Tanushree Tumane, Johannes Schindelin, Christian Couder, Miriam Rubio
From: Tanushree Tumane <tanushreetumane@gmail.com>
In 5e82c3dd22a (bisect--helper: `bisect_reset` shell function in C,
2019-01-02), the `git bisect reset` subcommand was ported to C. When the
call to `git checkout` failed, an error message was reported to the
user.
However, this error message used the `strbuf` that had just been
released already. Let's switch that around: first use it, then release
it.
Mentored-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Mentored-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Tanushree Tumane <tanushreetumane@gmail.com>
Signed-off-by: Miriam Rubio <mirucam@gmail.com>
---
This patch is a new version of
https://public-inbox.org/git/20191208172813.16518-1-mirucam@gmail.com/
which itself has been sent previously by Tanushree
(https://public-inbox.org/git/64117cde718f0d56ebfa4c30f4d8fe2155f5cf65.1551003074.git.gitgitgadget@gmail.com/).
builtin/bisect--helper.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
index 1fbe156e67..3055b2bb50 100644
--- a/builtin/bisect--helper.c
+++ b/builtin/bisect--helper.c
@@ -169,11 +169,12 @@ static int bisect_reset(const char *commit)
argv_array_pushl(&argv, "checkout", branch.buf, "--", NULL);
if (run_command_v_opt(argv.argv, RUN_GIT_CMD)) {
+ error(_("could not check out original"
+ " HEAD '%s'. Try 'git bisect"
+ " reset <commit>'."), branch.buf);
strbuf_release(&branch);
argv_array_clear(&argv);
- return error(_("could not check out original"
- " HEAD '%s'. Try 'git bisect"
- " reset <commit>'."), branch.buf);
+ return -1;
}
argv_array_clear(&argv);
}
--
2.21.0 (Apple Git-122.2)
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [Outreachy] [PATCH v2] bisect--helper: avoid free-after-use
2019-12-09 10:39 [Outreachy] [PATCH v2] bisect--helper: avoid free-after-use Miriam Rubio
@ 2019-12-11 17:17 ` Junio C Hamano
2019-12-11 17:24 ` Junio C Hamano
0 siblings, 1 reply; 6+ messages in thread
From: Junio C Hamano @ 2019-12-11 17:17 UTC (permalink / raw)
To: Miriam Rubio; +Cc: git, Tanushree Tumane, Johannes Schindelin, Christian Couder
Miriam Rubio <mirucam@gmail.com> writes:
> From: Tanushree Tumane <tanushreetumane@gmail.com>
>
> In 5e82c3dd22a (bisect--helper: `bisect_reset` shell function in C,
> 2019-01-02), the `git bisect reset` subcommand was ported to C. When the
> call to `git checkout` failed, an error message was reported to the
> user.
>
> However, this error message used the `strbuf` that had just been
> released already. Let's switch that around: first use it, then release
> it.
>
> Mentored-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
> Mentored-by: Christian Couder <chriscool@tuxfamily.org>
> Signed-off-by: Tanushree Tumane <tanushreetumane@gmail.com>
> Signed-off-by: Miriam Rubio <mirucam@gmail.com>
> ---
> This patch is a new version of
> https://public-inbox.org/git/20191208172813.16518-1-mirucam@gmail.com/
> which itself has been sent previously by Tanushree
> (https://public-inbox.org/git/64117cde718f0d56ebfa4c30f4d8fe2155f5cf65.1551003074.git.gitgitgadget@gmail.com/).
>
> builtin/bisect--helper.c | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
> index 1fbe156e67..3055b2bb50 100644
> --- a/builtin/bisect--helper.c
> +++ b/builtin/bisect--helper.c
> @@ -169,11 +169,12 @@ static int bisect_reset(const char *commit)
>
> argv_array_pushl(&argv, "checkout", branch.buf, "--", NULL);
> if (run_command_v_opt(argv.argv, RUN_GIT_CMD)) {
> + error(_("could not check out original"
> + " HEAD '%s'. Try 'git bisect"
> + " reset <commit>'."), branch.buf);
> strbuf_release(&branch);
> argv_array_clear(&argv);
> - return error(_("could not check out original"
> - " HEAD '%s'. Try 'git bisect"
> - " reset <commit>'."), branch.buf);
The original obviously was bad X-<. Will queue. Thanks.
> + return -1;
> }
> argv_array_clear(&argv);
> }
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [Outreachy] [PATCH v2] bisect--helper: avoid free-after-use
2019-12-11 17:17 ` Junio C Hamano
@ 2019-12-11 17:24 ` Junio C Hamano
2019-12-11 19:14 ` Miriam R.
2019-12-12 19:16 ` Johannes Schindelin
0 siblings, 2 replies; 6+ messages in thread
From: Junio C Hamano @ 2019-12-11 17:24 UTC (permalink / raw)
To: Miriam Rubio; +Cc: git, Tanushree Tumane, Johannes Schindelin, Christian Couder
Junio C Hamano <gitster@pobox.com> writes:
> Subject: Re: [Outreachy] [PATCH v2] bisect--helper: avoid free-after-use
It is surprising with multiple mentors, nobody noticed free-after-use
is perfectly fine---it is use-after-free we would want to avoid.
> Miriam Rubio <mirucam@gmail.com> writes:
>
>> From: Tanushree Tumane <tanushreetumane@gmail.com>
>>
>> In 5e82c3dd22a (bisect--helper: `bisect_reset` shell function in C,
>> 2019-01-02), the `git bisect reset` subcommand was ported to C. When the
>> call to `git checkout` failed, an error message was reported to the
>> user.
>>
>> However, this error message used the `strbuf` that had just been
>> released already. Let's switch that around: first use it, then release
>> it.
>>
>> Mentored-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
>> Mentored-by: Christian Couder <chriscool@tuxfamily.org>
>> Signed-off-by: Tanushree Tumane <tanushreetumane@gmail.com>
>> Signed-off-by: Miriam Rubio <mirucam@gmail.com>
>> ---
>> This patch is a new version of
>> https://public-inbox.org/git/20191208172813.16518-1-mirucam@gmail.com/
>> which itself has been sent previously by Tanushree
>> (https://public-inbox.org/git/64117cde718f0d56ebfa4c30f4d8fe2155f5cf65.1551003074.git.gitgitgadget@gmail.com/).
>>
>> builtin/bisect--helper.c | 7 ++++---
>> 1 file changed, 4 insertions(+), 3 deletions(-)
>>
>> diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
>> index 1fbe156e67..3055b2bb50 100644
>> --- a/builtin/bisect--helper.c
>> +++ b/builtin/bisect--helper.c
>> @@ -169,11 +169,12 @@ static int bisect_reset(const char *commit)
>>
>> argv_array_pushl(&argv, "checkout", branch.buf, "--", NULL);
>> if (run_command_v_opt(argv.argv, RUN_GIT_CMD)) {
>> + error(_("could not check out original"
>> + " HEAD '%s'. Try 'git bisect"
>> + " reset <commit>'."), branch.buf);
>> strbuf_release(&branch);
>> argv_array_clear(&argv);
>> - return error(_("could not check out original"
>> - " HEAD '%s'. Try 'git bisect"
>> - " reset <commit>'."), branch.buf);
>
> The original obviously was bad X-<. Will queue. Thanks.
>
>> + return -1;
>> }
>> argv_array_clear(&argv);
>> }
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [Outreachy] [PATCH v2] bisect--helper: avoid free-after-use
2019-12-11 17:24 ` Junio C Hamano
@ 2019-12-11 19:14 ` Miriam R.
2019-12-12 19:16 ` Johannes Schindelin
1 sibling, 0 replies; 6+ messages in thread
From: Miriam R. @ 2019-12-11 19:14 UTC (permalink / raw)
To: Junio C Hamano
Cc: git, Tanushree Tumane, Johannes Schindelin, Christian Couder
El mié., 11 dic. 2019 a las 18:24, Junio C Hamano
(<gitster@pobox.com>) escribió:
>
> Junio C Hamano <gitster@pobox.com> writes:
>
> > Subject: Re: [Outreachy] [PATCH v2] bisect--helper: avoid free-after-use
>
> It is surprising with multiple mentors, nobody noticed free-after-use
> is perfectly fine---it is use-after-free we would want to avoid.
>
Yes, you are right. I will send another version with the correct title.
Thank you,
Miriam
> > Miriam Rubio <mirucam@gmail.com> writes:
> >
> >> From: Tanushree Tumane <tanushreetumane@gmail.com>
> >>
> >> In 5e82c3dd22a (bisect--helper: `bisect_reset` shell function in C,
> >> 2019-01-02), the `git bisect reset` subcommand was ported to C. When the
> >> call to `git checkout` failed, an error message was reported to the
> >> user.
> >>
> >> However, this error message used the `strbuf` that had just been
> >> released already. Let's switch that around: first use it, then release
> >> it.
> >>
> >> Mentored-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
> >> Mentored-by: Christian Couder <chriscool@tuxfamily.org>
> >> Signed-off-by: Tanushree Tumane <tanushreetumane@gmail.com>
> >> Signed-off-by: Miriam Rubio <mirucam@gmail.com>
> >> ---
> >> This patch is a new version of
> >> https://public-inbox.org/git/20191208172813.16518-1-mirucam@gmail.com/
> >> which itself has been sent previously by Tanushree
> >> (https://public-inbox.org/git/64117cde718f0d56ebfa4c30f4d8fe2155f5cf65.1551003074.git.gitgitgadget@gmail.com/).
> >>
> >> builtin/bisect--helper.c | 7 ++++---
> >> 1 file changed, 4 insertions(+), 3 deletions(-)
> >>
> >> diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
> >> index 1fbe156e67..3055b2bb50 100644
> >> --- a/builtin/bisect--helper.c
> >> +++ b/builtin/bisect--helper.c
> >> @@ -169,11 +169,12 @@ static int bisect_reset(const char *commit)
> >>
> >> argv_array_pushl(&argv, "checkout", branch.buf, "--", NULL);
> >> if (run_command_v_opt(argv.argv, RUN_GIT_CMD)) {
> >> + error(_("could not check out original"
> >> + " HEAD '%s'. Try 'git bisect"
> >> + " reset <commit>'."), branch.buf);
> >> strbuf_release(&branch);
> >> argv_array_clear(&argv);
> >> - return error(_("could not check out original"
> >> - " HEAD '%s'. Try 'git bisect"
> >> - " reset <commit>'."), branch.buf);
> >
> > The original obviously was bad X-<. Will queue. Thanks.
> >
> >> + return -1;
> >> }
> >> argv_array_clear(&argv);
> >> }
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [Outreachy] [PATCH v2] bisect--helper: avoid free-after-use
2019-12-11 17:24 ` Junio C Hamano
2019-12-11 19:14 ` Miriam R.
@ 2019-12-12 19:16 ` Johannes Schindelin
1 sibling, 0 replies; 6+ messages in thread
From: Johannes Schindelin @ 2019-12-12 19:16 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Miriam Rubio, git, Tanushree Tumane, Christian Couder
Hi Junio,
On Wed, 11 Dec 2019, Junio C Hamano wrote:
> Junio C Hamano <gitster@pobox.com> writes:
>
> > Subject: Re: [Outreachy] [PATCH v2] bisect--helper: avoid free-after-use
>
> It is surprising with multiple mentors, nobody noticed free-after-use
> is perfectly fine---it is use-after-free we would want to avoid.
Wow. It is totally my fault, and the only thing I can blame is the
mind-numbing work I did on those security fixes. So glad that's over.
Sorry for the mistake,
Dscho
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Outreachy] [PATCH v2] bisect--helper: avoid free-after-use
@ 2019-12-09 10:56 Miriam Rubio
0 siblings, 0 replies; 6+ messages in thread
From: Miriam Rubio @ 2019-12-09 10:56 UTC (permalink / raw)
To: git; +Cc: Tanushree Tumane, Johannes Schindelin, Christian Couder, Miriam Rubio
From: Tanushree Tumane <tanushreetumane@gmail.com>
In 5e82c3dd22a (bisect--helper: `bisect_reset` shell function in C,
2019-01-02), the `git bisect reset` subcommand was ported to C. When the
call to `git checkout` failed, an error message was reported to the
user.
However, this error message used the `strbuf` that had just been
released already. Let's switch that around: first use it, then release
it.
Mentored-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Mentored-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Tanushree Tumane <tanushreetumane@gmail.com>
Signed-off-by: Miriam Rubio <mirucam@gmail.com>
---
This patch is a new version of
https://public-inbox.org/git/20191208172813.16518-1-mirucam@gmail.com/
which itself has been sent previously by Tanushree
(https://public-inbox.org/git/64117cde718f0d56ebfa4c30f4d8fe2155f5cf65.1551003074.git.gitgitgadget@gmail.com/).
builtin/bisect--helper.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
index 1fbe156e67..3055b2bb50 100644
--- a/builtin/bisect--helper.c
+++ b/builtin/bisect--helper.c
@@ -169,11 +169,12 @@ static int bisect_reset(const char *commit)
argv_array_pushl(&argv, "checkout", branch.buf, "--", NULL);
if (run_command_v_opt(argv.argv, RUN_GIT_CMD)) {
+ error(_("could not check out original"
+ " HEAD '%s'. Try 'git bisect"
+ " reset <commit>'."), branch.buf);
strbuf_release(&branch);
argv_array_clear(&argv);
- return error(_("could not check out original"
- " HEAD '%s'. Try 'git bisect"
- " reset <commit>'."), branch.buf);
+ return -1;
}
argv_array_clear(&argv);
}
--
2.21.0 (Apple Git-122.2)
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-12-12 19:16 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-09 10:39 [Outreachy] [PATCH v2] bisect--helper: avoid free-after-use Miriam Rubio
2019-12-11 17:17 ` Junio C Hamano
2019-12-11 17:24 ` Junio C Hamano
2019-12-11 19:14 ` Miriam R.
2019-12-12 19:16 ` Johannes Schindelin
2019-12-09 10:56 Miriam Rubio
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).