Skip to contentSkip to conversation

bisect--helper: avoid free-after-use

PATCH Superseded Miriam Rubio 3 participants 5 messages Dec 9, 2019 – Dec 12, 2019

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 bisect--helper: avoid free-after-use

From: Tanushree Tumane <[email protected]>

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.

---
This patch is a new version of
https://public-inbox.org/git/[email protected]/
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(-)
builtin/bisect--helper.c +4 -3
index 1fbe156e67..3055b2bb50 100644
@@ -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);
 	}
Signature · 1 line
2.21.0 (Apple Git-122.2)
#1 lore raw
Quoted 30 lines · Miriam Rubio

From: Tanushree Tumane <[email protected]>

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.

---
This patch is a new version of
https://public-inbox.org/git/[email protected]/
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(-)
builtin/bisect--helper.c +0 -0
index 1fbe156e67..3055b2bb50 100644
@@ -169,11 +169,12 @@ static int bisect_reset(const char *commit)
 

builtin/bisect--helper.c static int bisect_reset(const char *commit) · line 176

Quoted 10 lines
builtin/bisect--helper.c +3 -3
 		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.

Quoted 4 lines
builtin/bisect--helper.c +1 -0
+			return -1;
 		}
 		argv_array_clear(&argv);
 	}
#2 lore raw
Quoted 1 line · Junio C Hamano

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.

Quoted 49 lines
Quoted 30 lines · Miriam Rubio

From: Tanushree Tumane <[email protected]>

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.

---
This patch is a new version of
https://public-inbox.org/git/[email protected]/
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(-)
builtin/bisect--helper.c +0 -0
index 1fbe156e67..3055b2bb50 100644
@@ -169,11 +169,12 @@ static int bisect_reset(const char *commit)
 

builtin/bisect--helper.c static int bisect_reset(const char *commit) · line 176

Quoted 10 lines
builtin/bisect--helper.c +3 -3
 		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.

Quoted 4 lines
builtin/bisect--helper.c +1 -0
+			return -1;
 		}
 		argv_array_clear(&argv);
 	}
author
#3 lore raw
Quoted 8 lines · Junio C Hamano
Quoted 1 line · Junio C Hamano

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

Quoted 49 lines
Quoted 49 lines
Quoted 30 lines · Miriam Rubio

From: Tanushree Tumane <[email protected]>

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.

---
This patch is a new version of
https://public-inbox.org/git/[email protected]/
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(-)
builtin/bisect--helper.c +0 -0
index 1fbe156e67..3055b2bb50 100644
@@ -169,11 +169,12 @@ static int bisect_reset(const char *commit)
 

builtin/bisect--helper.c static int bisect_reset(const char *commit) · line 176

Quoted 10 lines
builtin/bisect--helper.c +3 -3
             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.

Quoted 4 lines
builtin/bisect--helper.c +1 -0
+                    return -1;
             }
             argv_array_clear(&argv);
     }
#4 lore raw
In reply to Junio C Hamano

Hi Junio,

Quoted 6 lines · Junio C Hamano
Quoted 1 line · Junio C Hamano

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