From: "Nipunn Koorapati via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Nipunn Koorapati <nipunn1313@gmail.com>
Subject: [PATCH v2 0/2] negative-refspec: fix segfault on : refspec
Date: Sat, 19 Dec 2020 21:58:35 +0000 [thread overview]
Message-ID: <pull.820.v2.git.1608415117.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.820.git.1608398598893.gitgitgadget@gmail.com>
Previously, if remote.origin.push was set to ":", git would segfault during
a push operation, due to bad parsing logic in
query_matches_negative_refspec. Per bisect, the bug was introduced in:
c0192df630 (refspec: add support for negative refspecs, 2020-09-30)
We found this issue when rolling out git 2.29 at Dropbox - as several folks
had "push = :" in their configuration. I based my diff off the master
branch, but also confirmed that it patches cleanly onto maint - if the
maintainers would like to also fix the segfault on 2.29
Update since Patch series V1:
* Handled matching refspec explicitly
* Added testing for "+:" case
* Added comment explaining how the two loops work together
It may be wise to add additional testing for a case with a matching refspec
+ negative refspec with expected behavior
Nipunn Koorapati (2):
negative-refspec: fix segfault on : refspec
negative-refspec: improve comment on query_matches_negative_refspec
remote.c | 16 +++++++++++++---
t/t5582-fetch-negative-refspec.sh | 15 +++++++++++++++
2 files changed, 28 insertions(+), 3 deletions(-)
base-commit: 6d3ef5b467eccd2769f1aa1c555d317d3c8dc707
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-820%2Fnipunn1313%2Fnk%2Fpush-refspec-segfault-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-820/nipunn1313/nk/push-refspec-segfault-v2
Pull-Request: https://github.com/gitgitgadget/git/pull/820
Range-diff vs v1:
1: 743e848653f ! 1: e42200b644a negative-refspec: fix segfault on : refspec
@@ Metadata
## Commit message ##
negative-refspec: fix segfault on : refspec
- Previously, if remote.origin.push was set to ":",
- git would segfault during a push operation, due to bad
- parsing logic in query_matches_negative_refspec. Per
- bisect, the bug was introduced in:
- c0192df630 (refspec: add support for negative refspecs, 2020-09-30)
+ The logic added to check for negative pathspec match by c0192df630
+ (refspec: add support for negative refspecs, 2020-09-30) looks at
+ refspec->src assuming it is never NULL, however when
+ remote.origin.push is set to ":", then refspec->src is NULL,
+ causing a segfault within strcmp
Added testing for this case in fetch-negative-refspec
@@ remote.c: static int query_matches_negative_refspec(struct refspec *rs, struct r
- } else {
- if (!strcmp(needle, refspec->src))
- string_list_append(&reversed, refspec->src);
-+ } else if (refspec->src != NULL && !strcmp(needle, refspec->src)) {
++ } else if (refspec->matching) {
++ /* For the special matching refspec, any query should match */
++ string_list_append(&reversed, needle);
++ } else if (refspec->src == NULL) {
++ BUG("refspec->src should not be null here");
++ } else if (!strcmp(needle, refspec->src)) {
+ string_list_append(&reversed, refspec->src);
}
}
@@ t/t5582-fetch-negative-refspec.sh: test_expect_success "fetch --prune with negat
)
'
-+test_expect_success "push with empty refspec" '
++test_expect_success "push with matching ':' refspec" '
+ (
+ cd two &&
+ git config remote.one.push : &&
+ # Fails w/ tip behind counterpart - but should not segfault
+ test_must_fail git push one master &&
++
++ git config remote.one.push +: &&
++ # Fails w/ tip behind counterpart - but should not segfault
++ test_must_fail git push one master &&
++
+ git config --unset remote.one.push
+ )
+'
-: ----------- > 2: 8da8d9cd1c5 negative-refspec: improve comment on query_matches_negative_refspec
--
gitgitgadget
next prev parent reply other threads:[~2020-12-19 22:01 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-19 17:23 [PATCH] negative-refspec: fix segfault on : refspec Nipunn Koorapati via GitGitGadget
2020-12-19 18:05 ` Junio C Hamano
2021-02-19 9:28 ` Jacob Keller
2020-12-19 21:58 ` Nipunn Koorapati via GitGitGadget [this message]
2020-12-19 21:58 ` [PATCH v2 1/2] " Nipunn Koorapati via GitGitGadget
2020-12-20 2:57 ` Eric Sunshine
2020-12-19 21:58 ` [PATCH v2 2/2] negative-refspec: improve comment on query_matches_negative_refspec Nipunn Koorapati via GitGitGadget
2020-12-21 2:05 ` [PATCH v3 0/3] negative-refspec: fix segfault on : refspec Nipunn Koorapati via GitGitGadget
2020-12-21 2:05 ` [PATCH v3 1/3] test-lib-functions: handle --add in test_config Nipunn Koorapati via GitGitGadget
2020-12-21 7:07 ` Eric Sunshine
2020-12-21 19:00 ` Junio C Hamano
2020-12-21 20:08 ` Eric Sunshine
2020-12-22 0:00 ` Nipunn Koorapati
2020-12-22 0:13 ` Eric Sunshine
2020-12-22 2:25 ` Nipunn Koorapati
2020-12-22 5:19 ` Eric Sunshine
2020-12-21 2:05 ` [PATCH v3 2/3] negative-refspec: fix segfault on : refspec Nipunn Koorapati via GitGitGadget
2020-12-21 7:20 ` Eric Sunshine
2020-12-21 2:05 ` [PATCH v3 3/3] negative-refspec: improve comment on query_matches_negative_refspec Nipunn Koorapati via GitGitGadget
2020-12-22 1:11 ` [PATCH v4 0/2] negative-refspec: fix segfault on : refspec Nipunn Koorapati via GitGitGadget
2020-12-22 1:11 ` [PATCH v4 1/2] " Nipunn Koorapati via GitGitGadget
2020-12-22 2:08 ` Junio C Hamano
2020-12-22 2:28 ` Junio C Hamano
2020-12-22 1:11 ` [PATCH v4 2/2] negative-refspec: improve comment on query_matches_negative_refspec Nipunn Koorapati via GitGitGadget
2020-12-22 3:58 ` [PATCH v5 0/2] negative-refspec: fix segfault on : refspec Nipunn Koorapati via GitGitGadget
2020-12-22 3:58 ` [PATCH v5 1/2] " Nipunn Koorapati via GitGitGadget
2021-02-19 9:32 ` Jacob Keller
2020-12-22 3:58 ` [PATCH v5 2/2] negative-refspec: improve comment on query_matches_negative_refspec Nipunn Koorapati via GitGitGadget
2020-12-22 6:48 ` [PATCH v5 0/2] negative-refspec: fix segfault on : refspec Junio C Hamano
2020-12-23 23:56 ` Nipunn Koorapati
2020-12-24 0:00 ` Junio C Hamano
2021-01-11 20:22 ` Nipunn Koorapati
2021-01-12 2:01 ` 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=pull.820.v2.git.1608415117.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=nipunn1313@gmail.com \
/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).