All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: Derrick Stolee <derrickstolee@github.com>
Cc: Derrick Stolee via GitGitGadget <gitgitgadget@gmail.com>,
	git@vger.kernel.org, gitster@pobox.com,
	johannes.schindelin@gmx.de, me@ttaylorr.com,
	Jeff Hostetler <git@jeffhostetler.com>,
	Phillip Wood <phillip.wood123@gmail.com>,
	Elijah Newren <newren@gmail.com>
Subject: Re: [PATCH 5/5] branch: fix branch_checked_out() leaks
Date: Tue, 14 Jun 2022 18:43:57 +0200	[thread overview]
Message-ID: <220614.86v8t3xkfi.gmgdl@evledraar.gmail.com> (raw)
In-Reply-To: <0d00d910-a7aa-dfd8-a24c-51968800c2a8@github.com>


On Tue, Jun 14 2022, Derrick Stolee wrote:

> On 6/13/2022 8:33 PM, Ævar Arnfjörð Bjarmason wrote:
>> 
>> On Mon, Jun 13 2022, Derrick Stolee wrote:
>> 
>>> On 6/8/2022 4:08 PM, Derrick Stolee via GitGitGadget wrote:
>
>>> While TEST_PASSES_SANITIZE_LEAK would be helpful to demonstrate the
>>> leakage and prevent it in the future, t2407 uses helpers such as 'git
>>> clone' that cause the test to fail under that mode.
>> 
>> If you apply this:
>> 	
>> 	diff --git a/t/t2407-worktree-heads.sh b/t/t2407-worktree-heads.sh
>> 	index 0760595337b..d41171acb83 100755
>> 	--- a/t/t2407-worktree-heads.sh
>> 	+++ b/t/t2407-worktree-heads.sh
>> 	@@ -10,16 +10,8 @@ test_expect_success 'setup' '
>> 	 		test_commit $i &&
>> 	 		git branch wt-$i &&
>> 	 		git worktree add wt-$i wt-$i || return 1
>> 	-	done &&
>> 	-
>> 	-	# Create a server that updates each branch by one commit
>> 	-	git clone . server &&
>> 	-	git remote add server ./server &&
>> 	-	for i in 1 2 3 4
>> 	-	do
>> 	-		git -C server checkout wt-$i &&
>> 	-		test_commit -C server A-$i || return 1
>> 	 	done
>> 	+
>> 	 '
>> 	 
>> 	 test_expect_success 'refuse to overwrite: checked out in worktree' '
>> 
>> And compile with SANITIZE=leak then this will pass as:
>> 
>> 	./t2407-worktree-heads.sh  --run=1,6
>
> Of course this works for the tests that don't need the 'server' repo,
> but it fails in the tests that _do_ need it.
>
> I'm able to make this work by creating the 'server' with init and
> creating the wt-$i branches from scratch (they don't need to be
> fast-forward updates).
>
> The linux-leaks tests still fail due to 'git fetch' and 'git bisect'
> calls, but these can be avoided by carefully splitting the tests and
> using the !SANITIZE_LEAK prereq.

I mean copy/paste the existing file to a new one with this on top, then
remove all tests that aren't your new one. That worked for me, doesn't
it work for you?

>> Normally I'd just say "let's leave it for later", but in this case the
>> entire point of the commit and the relatively lengthy test is to deal
>> with a memory leak, so just copy/pasting the few lines of setup you
>> actually need to a new test & testing with SANITIZE=leak seems worth the
>> effort in this case.
>
> Well, the point isn't to use automation to check for leaks, but instead
> to fix leaks and add tests for the case where we previously had leaks.
> The tests demonstrate that we aren't accidentally introducing a use-after-
> free or double-free.

I mean that the patch subject is "fix[...]leaks", and this gives it a
CI'd regression test, which seems worth it.

Of course it's also nice to check for use-after-fre etc., but we have
other coverage for that. E.g. glibc in CI spots double-free issues with
how we set it up, and we tend to segfault soon enough (or someone runs
SANITIZE=address) on use-after-free.

  reply	other threads:[~2022-06-14 16:46 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-08 20:08 [PATCH 0/4] Create branch_checked_out() helper Derrick Stolee via GitGitGadget
2022-06-08 20:08 ` [PATCH 1/4] branch: add " Derrick Stolee via GitGitGadget
2022-06-09 23:47   ` Junio C Hamano
2022-06-13 23:59   ` Ævar Arnfjörð Bjarmason
2022-06-14 13:32     ` Derrick Stolee
2022-06-14 15:24       ` Ævar Arnfjörð Bjarmason
2022-06-14 10:09   ` Phillip Wood
2022-06-14 11:22     ` Phillip Wood
2022-06-14 13:48     ` Derrick Stolee
2022-06-08 20:09 ` [PATCH 2/4] branch: check for bisects and rebases Derrick Stolee via GitGitGadget
2022-06-08 22:03   ` Junio C Hamano
2022-06-08 20:09 ` [PATCH 3/4] fetch: use new branch_checked_out() and add tests Derrick Stolee via GitGitGadget
2022-06-14  0:05   ` Ævar Arnfjörð Bjarmason
2022-06-14 10:10   ` Phillip Wood
2022-06-14 14:06     ` Derrick Stolee
2022-06-08 20:09 ` [PATCH 4/4] branch: use branch_checked_out() when deleting refs Derrick Stolee via GitGitGadget
2022-06-13 14:59 ` [PATCH 5/5] branch: fix branch_checked_out() leaks Derrick Stolee
2022-06-13 23:03   ` Junio C Hamano
2022-06-14  0:33   ` Ævar Arnfjörð Bjarmason
2022-06-14 15:37     ` Derrick Stolee
2022-06-14 16:43       ` Ævar Arnfjörð Bjarmason [this message]
2022-06-14 19:27 ` [PATCH v2 0/5] Create branch_checked_out() helper Derrick Stolee via GitGitGadget
2022-06-14 19:27   ` [PATCH v2 1/5] branch: add " Derrick Stolee via GitGitGadget
2022-06-14 19:27   ` [PATCH v2 2/5] branch: check for bisects and rebases Derrick Stolee via GitGitGadget
2022-06-14 19:27   ` [PATCH v2 3/5] fetch: use new branch_checked_out() and add tests Derrick Stolee via GitGitGadget
2022-06-14 19:27   ` [PATCH v2 4/5] branch: use branch_checked_out() when deleting refs Derrick Stolee via GitGitGadget
2022-06-14 19:27   ` [PATCH v2 5/5] branch: fix branch_checked_out() leaks Derrick Stolee via GitGitGadget
2022-06-19 13:58   ` [PATCH v2 0/5] Create branch_checked_out() helper Phillip Wood

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=220614.86v8t3xkfi.gmgdl@evledraar.gmail.com \
    --to=avarab@gmail.com \
    --cc=derrickstolee@github.com \
    --cc=git@jeffhostetler.com \
    --cc=git@vger.kernel.org \
    --cc=gitgitgadget@gmail.com \
    --cc=gitster@pobox.com \
    --cc=johannes.schindelin@gmx.de \
    --cc=me@ttaylorr.com \
    --cc=newren@gmail.com \
    --cc=phillip.wood123@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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.