threads / patch / 60141

v2t6300: fix match with insecure memory

Subject: [PATCH v2 1/1] t6300: fix match with insecure memory

## tl;dr

13 messages between Aug 21, 2023 and Aug 23, 2023. Diffs are folded; open one to read it.

replies: 12people: 4as markdown or json

Christian Hesse· Aug 21, 2023, 20:24 UTC · lore

Re: [PATCH 1/1] t6300: fix match with insecure memory

Christian Hesse <list@eworm.de> on Mon, 2023/08/21 22:06:
Show 8 quoted lines
> From: Christian Hesse <mail@eworm.de>
> 
> Running the tests in a build environment makes gnupg print a warning:
> 
> gpg: Warning: using insecure memory!
> 
> This warning breaks the match, as `head` misses one line. Let's strip
> the line, make `head` return what is expected and fix the match.

Ups, my fingers are typing too fast... Of course this one was incomplete. See the follow up...

-- 
main(a){char*c=/*    Schoene Gruesse                         */"B?IJj;MEH"
"CX:;",b;for(a/*    Best regards             my address:    */=0;b=c[a++];)
putchar(b-1/(/*    Chris            cc -ox -xc - && ./x    */b/42*2-3)*42);}
Christian Hesse· Aug 21, 2023, 20:25 UTC · re: Christian Hesse · lore
From: Christian Hesse <mail@eworm.de>
Running the tests in a build environment makes gnupg print a warning:
gpg: Warning: using insecure memory!

This warning breaks the match, as `head` misses one line. Let's strip the line, make `head` return what is expected and fix the match.

Signed-off-by: Christian Hesse <mail@eworm.de>
---
 t/t6300-for-each-ref.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
Show changes to t/t6300-for-each-ref.sh +3 −2
diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh
index 5b434ab451..0f9981798e 100755
--- a/t/t6300-for-each-ref.sh
+++ b/t/t6300-for-each-ref.sh
@@ -1764,12 +1764,13 @@ test_expect_success GPGSSH 'setup for signature atom using ssh' '
 
 test_expect_success GPG2 'bare signature atom' '
 	git verify-commit first-signed 2>out.raw &&
-	grep -Ev "checking the trustdb|PGP trust model" out.raw >out &&
+	grep -Ev "checking the trustdb|PGP trust model|using insecure memory" out.raw >out &&
 	head -3 out >expect &&
 	tail -1 out >>expect &&
 	echo  >>expect &&
 	git for-each-ref refs/tags/first-signed \
-		--format="%(signature)" >actual &&
+		--format="%(signature)" >out.raw &&
+	grep -Ev "using insecure memory" out.raw >actual &&
 	test_cmp expect actual
 '
 
-- 
2.41.0
Kousik Sanagavarapu· Aug 22, 2023, 07:54 UTC · re: Christian Hesse · lore

Re: [PATCH v2 1/1] t6300: fix match with insecure memory

Christian Hesse <list@eworm.de> wrote:
Show 10 quoted lines
> From: Christian Hesse <mail@eworm.de>
> 
> Running the tests in a build environment makes gnupg print a warning:
> 
> gpg: Warning: using insecure memory!
>
> This warning breaks the match, as `head` misses one line. Let's strip
> the line, make `head` return what is expected and fix the match.
>
> Signed-off-by: Christian Hesse <mail@eworm.de>

I think a bit of an explanation about why this warning is showing up in the commit message would be good.

"man gpg" gives me
	On older systems this program should be installed as setuid(root).
	This is necessary to lock memory  pages.  Locking  memory
	pages prevents the operating system from writing memory pages (which
	may contain passphrases or other sensitive material) to disk. If you
	get no warning message about insecure memory your operating system
	supports locking  without  being  root.  The program drops root
	privileges as soon as locked memory is allocated.
	Note  also  that  some systems (especially laptops) have the ability to
	``suspend to disk'' (also known as ``safe sleep'' or ``hibernate'').
	This writes all memory to disk before going into a low power or even
	powered off mode.  Unless measures are taken  in  the operating system
	to protect the saved memory, passphrases or other sensitive material
	may be recoverable from it later.

So it seems that this warning will pop up if gpg is writing memory pages to disk which is bad because as stated above we don't want these pages written to disk which is a security risk.

Show 26 quoted lines
> ---
>  t/t6300-for-each-ref.sh | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh
> index 5b434ab451..0f9981798e 100755
> --- a/t/t6300-for-each-ref.sh
> +++ b/t/t6300-for-each-ref.sh
> @@ -1764,12 +1764,13 @@ test_expect_success GPGSSH 'setup for signature atom using ssh' '
>  
>  test_expect_success GPG2 'bare signature atom' '
>  	git verify-commit first-signed 2>out.raw &&
> -	grep -Ev "checking the trustdb|PGP trust model" out.raw >out &&
> +	grep -Ev "checking the trustdb|PGP trust model|using insecure memory" out.raw >out &&
>  	head -3 out >expect &&
>  	tail -1 out >>expect &&
>  	echo  >>expect &&
>  	git for-each-ref refs/tags/first-signed \
> -		--format="%(signature)" >actual &&
> +		--format="%(signature)" >out.raw &&
> +	grep -Ev "using insecure memory" out.raw >actual &&
>  	test_cmp expect actual
>  '
>  
> -- 
> 2.41.0

We skip "checking the trustdb" and "PGP trust model" lines (which are not warnings) here because we don't really need those from the output that GPG produces here but skipping a warning too seems kind of a question mark.

It also seems that one could use "--no-secmem-warning" to suppress such a warning. So a better place to make a change would not be in t/t6300 but in t/lib-gpg from where the prereq GPG2 comes from. Although I'm against this, because we don't really want to suppress any warnings.

I think it is a good thing this test is breaking because it informs us about the security risk. I have Cc'ed people who might have a thought on this. So it's better to wait for their response.

Thanks
Christian Hesse· Aug 22, 2023, 09:04 UTC · re: Kousik Sanagavarapu · lore

Re: [PATCH v2 1/1] t6300: fix match with insecure memory

Kousik Sanagavarapu <five231003@gmail.com> on Tue, 2023/08/22 13:24:
Show 21 quoted lines
> Christian Hesse <list@eworm.de> wrote:
> 
> > From: Christian Hesse <mail@eworm.de>
> > 
> > Running the tests in a build environment makes gnupg print a warning:
> > 
> > gpg: Warning: using insecure memory!
> >
> > This warning breaks the match, as `head` misses one line. Let's strip
> > the line, make `head` return what is expected and fix the match.
> >
> > Signed-off-by: Christian Hesse <mail@eworm.de>  
> 
> I think a bit of an explanation about why this warning is showing up in the
> commit message would be good.
> 
> "man gpg" gives me <stripped>
> 
> So it seems that this warning will pop up if gpg is writing memory pages to
> disk which is bad because as stated above we don't want these pages written
> to disk which is a security risk.

The Arch Linux packages are built inside a clean container, started via systemd-nspawn. Within the container the system call @memlock is not allowed by default, for security reasons. There's an upstream systemd issue on this topic:

https://github.com/systemd/systemd/issues/9414

Note this is only true at build time. If the packages are installed on the actual system the @memlock system call is available and things work as expected without issues.

Show 39 quoted lines
> > ---
> >  t/t6300-for-each-ref.sh | 5 +++--
> >  1 file changed, 3 insertions(+), 2 deletions(-)
> > 
> > diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh
> > index 5b434ab451..0f9981798e 100755
> > --- a/t/t6300-for-each-ref.sh
> > +++ b/t/t6300-for-each-ref.sh
> > @@ -1764,12 +1764,13 @@ test_expect_success GPGSSH 'setup for signature
> > atom using ssh' ' 
> >  test_expect_success GPG2 'bare signature atom' '
> >  	git verify-commit first-signed 2>out.raw &&
> > -	grep -Ev "checking the trustdb|PGP trust model" out.raw >out &&
> > +	grep -Ev "checking the trustdb|PGP trust model|using insecure
> > memory" out.raw >out && head -3 out >expect &&
> >  	tail -1 out >>expect &&
> >  	echo  >>expect &&
> >  	git for-each-ref refs/tags/first-signed \
> > -		--format="%(signature)" >actual &&
> > +		--format="%(signature)" >out.raw &&
> > +	grep -Ev "using insecure memory" out.raw >actual &&
> >  	test_cmp expect actual
> >  '
> >  
> > -- 
> > 2.41.0  
> 
> We skip "checking the trustdb" and "PGP trust model" lines (which are not
> warnings) here because we don't really need those from the output that GPG
> produces here but skipping a warning too seems kind of a question mark.
>
> It also seems that one could use "--no-secmem-warning" to suppress such a
> warning. So a better place to make a change would not be in t/t6300 but in
> t/lib-gpg from where the prereq GPG2 comes from. Although I'm against this,
> because we don't really want to suppress any warnings.
>
> I think it is a good thing this test is breaking because it informs us about
> the security risk. I have Cc'ed people who might have a thought on this. So
> it's better to wait for their response.

Well, after all I just want to change the tests to succeed with our build environment, let's take a detailed look at the issue. All command below are inside the build environment, so including the warning about insecure memory.

The output of `git verify-commit first-signed` is:

---- >8 ---- gpg: Warning: using insecure memory! gpg: Signature made Tue Aug 22 08:46:43 2023 UTC gpg: using DSA key 73D758744BE721698EC54E8713B6F51ECDDE430D gpg: issuer "committer@example.com" gpg: checking the trustdb gpg: marginals needed: 3 completes needed: 1 trust model: pgp gpg: depth: 0 valid: 1 signed: 0 trust: 0-, 0q, 0n, 0m, 0f, 1u gpg: Good signature from "C O Mitter <committer@example.com>" [ultimate] ---- >8 ----

Whereas `git for-each-ref refs/tags/first-signed --format="%(signature)"` gives:

---- >8 ---- gpg: Warning: using insecure memory! gpg: Signature made Tue Aug 22 08:46:43 2023 UTC gpg: using DSA key 73D758744BE721698EC54E8713B6F51ECDDE430D gpg: issuer "committer@example.com" gpg: Good signature from "C O Mitter <committer@example.com>" [ultimate]

---- >8 ----

Running `head -3` on first output causes the warning to be included, but the issuer line to be removed. That is what finally differs between `expect` and `actual`.

Just changing the number of lines brings other issues I guess... As far as I known the output on issuer was added recently with a gnupg release.

So we need a set of commands to bring the output of both command in line, with or without warning on insecure memory.

-- 
main(a){char*c=/*    Schoene Gruesse                         */"B?IJj;MEH"
"CX:;",b;for(a/*    Best regards             my address:    */=0;b=c[a++];)
putchar(b-1/(/*    Chris            cc -ox -xc - && ./x    */b/42*2-3)*42);}
Christian Hesse· Aug 22, 2023, 13:01 UTC · re: Christian Hesse · lore

Re: [PATCH v2 1/1] t6300: fix match with insecure memory

Christian Hesse <list@eworm.de> on Tue, 2023/08/22 11:04:
> So we need a set of commands to bring the output of both command in line,
> with or without warning on insecure memory.

I think I found a clean solution... Running a trustdb update earlier makes the extra lines go away, and we do not need to filter them. See the follow up...

-- 
main(a){char*c=/*    Schoene Gruesse                         */"B?IJj;MEH"
"CX:;",b;for(a/*    Best regards             my address:    */=0;b=c[a++];)
putchar(b-1/(/*    Chris            cc -ox -xc - && ./x    */b/42*2-3)*42);}
Christian Hesse· Aug 22, 2023, 13:03 UTC · re: Christian Hesse · lore

[PATCH 1/2] t/lib-gpg: forcibly run a trustdb update

From: Christian Hesse <mail@eworm.de>

We want to compare output later, so randomly popping up 'gpg: checking the trustdb' breaks the tests. Run the trustdb update forcibly.

Signed-off-by: Christian Hesse <mail@eworm.de>
---
 t/lib-gpg.sh | 1 +
 1 file changed, 1 insertion(+)
Show changes to t/lib-gpg.sh +1 −0
diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh
index 4eebd9c2b5..83b83c9abb 100644
--- a/t/lib-gpg.sh
+++ b/t/lib-gpg.sh
@@ -45,6 +45,7 @@ test_lazy_prereq GPG '
 			"$TEST_DIRECTORY"/lib-gpg/keyring.gpg &&
 		gpg --homedir "${GNUPGHOME}" --import-ownertrust \
 			"$TEST_DIRECTORY"/lib-gpg/ownertrust &&
+		gpg --homedir "${GNUPGHOME}" --update-trustdb &&
 		gpg --homedir "${GNUPGHOME}" </dev/null >/dev/null \
 			--sign -u committer@example.com
 		;;
-- 
2.42.0
Christian Hesse· Aug 22, 2023, 13:03 UTC · re: Christian Hesse · lore

[PATCH 2/2] t/t6300: drop magic filtering

From: Christian Hesse <mail@eworm.de>

Now that we ran a trustdb check forcibly it does no longer pullute the output. Filtering is no longer required...

Signed-off-by: Christian Hesse <mail@eworm.de>
---
 t/t6300-for-each-ref.sh | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
Show changes to t/t6300-for-each-ref.sh +1 −4
diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh
index 5b434ab451..aa3c7c03c4 100755
--- a/t/t6300-for-each-ref.sh
+++ b/t/t6300-for-each-ref.sh
@@ -1763,10 +1763,7 @@ test_expect_success GPGSSH 'setup for signature atom using ssh' '
 '
 
 test_expect_success GPG2 'bare signature atom' '
-	git verify-commit first-signed 2>out.raw &&
-	grep -Ev "checking the trustdb|PGP trust model" out.raw >out &&
-	head -3 out >expect &&
-	tail -1 out >>expect &&
+	git verify-commit first-signed 2>expect &&
 	echo  >>expect &&
 	git for-each-ref refs/tags/first-signed \
 		--format="%(signature)" >actual &&
-- 
2.42.0
Eric Sunshine· Aug 22, 2023, 16:43 UTC · re: Christian Hesse · lore

Re: [PATCH 2/2] t/t6300: drop magic filtering

On Tue, Aug 22, 2023 at 9:03 AM Christian Hesse <list@eworm.de> wrote:
> Now that we ran a trustdb check forcibly it does no longer pullute the
> output. Filtering is no longer required...
s/pullute/pollute/
> Signed-off-by: Christian Hesse <mail@eworm.de>
Christian Hesse· Aug 23, 2023, 06:52 UTC · re: Eric Sunshine · lore

[PATCH v2 2/2] t/t6300: drop magic filtering

From: Christian Hesse <mail@eworm.de>

Now that we ran a trustdb check forcibly it does no longer pollute the output. Filtering is no longer required...

Signed-off-by: Christian Hesse <mail@eworm.de>
---
 t/t6300-for-each-ref.sh | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
Show changes to t/t6300-for-each-ref.sh +1 −4
diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh
index 5b434ab451..aa3c7c03c4 100755
--- a/t/t6300-for-each-ref.sh
+++ b/t/t6300-for-each-ref.sh
@@ -1763,10 +1763,7 @@ test_expect_success GPGSSH 'setup for signature atom using ssh' '
 '
 
 test_expect_success GPG2 'bare signature atom' '
-	git verify-commit first-signed 2>out.raw &&
-	grep -Ev "checking the trustdb|PGP trust model" out.raw >out &&
-	head -3 out >expect &&
-	tail -1 out >>expect &&
+	git verify-commit first-signed 2>expect &&
 	echo  >>expect &&
 	git for-each-ref refs/tags/first-signed \
 		--format="%(signature)" >actual &&
-- 
2.42.0
Kousik Sanagavarapu· Aug 23, 2023, 13:20 UTC · re: Christian Hesse · lore

Re: [PATCH v2 2/2] t/t6300: drop magic filtering

On Wed, Aug 23, 2023 at 08:52:17AM +0200, Christian Hesse wrote:
> From: Christian Hesse <mail@eworm.de>
> 
> Now that we ran a trustdb check forcibly it does no longer pollute the
> output. Filtering is no longer required...
s/forcibly/forcibly, 
s/it does no longer pollute/it no longer pollutes
Also, maybe instead of "... the output.",
	"...the output when we encounter a signature check and hence filtering is no
	longer required."
or along similar lines.
Show 23 quoted lines
> Signed-off-by: Christian Hesse <mail@eworm.de>
> ---
>  t/t6300-for-each-ref.sh | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh
> index 5b434ab451..aa3c7c03c4 100755
> --- a/t/t6300-for-each-ref.sh
> +++ b/t/t6300-for-each-ref.sh
> @@ -1763,10 +1763,7 @@ test_expect_success GPGSSH 'setup for signature atom using ssh' '
>  '
>  
>  test_expect_success GPG2 'bare signature atom' '
> -	git verify-commit first-signed 2>out.raw &&
> -	grep -Ev "checking the trustdb|PGP trust model" out.raw >out &&
> -	head -3 out >expect &&
> -	tail -1 out >>expect &&
> +	git verify-commit first-signed 2>expect &&
>  	echo  >>expect &&
>  	git for-each-ref refs/tags/first-signed \
>  		--format="%(signature)" >actual &&
> -- 
> 2.42.0

The code looks really clean now, wow. Although I'm curious why both the changes weren't in a single commit. Is it because 1/2 is applicable generally and not only to this specific test?

Thanks
Junio C Hamano· Aug 23, 2023, 16:14 UTC · re: Kousik Sanagavarapu · lore

Re: [PATCH v2 2/2] t/t6300: drop magic filtering

Kousik Sanagavarapu <five231003@gmail.com> writes:
Show 9 quoted lines
> On Wed, Aug 23, 2023 at 08:52:17AM +0200, Christian Hesse wrote:
>> From: Christian Hesse <mail@eworm.de>
>> 
>> Now that we ran a trustdb check forcibly it does no longer pollute the
>> output. Filtering is no longer required...
>
> s/forcibly/forcibly, 
>
> s/it does no longer pollute/it no longer pollutes
Thanks.  I've updated the patch locally to read like so:
----- >8 -----
From: Christian Hesse <mail@eworm.de>
Date: Tue, 22 Aug 2023 15:03:15 +0200
Subject: [PATCH] t/t6300: drop magic filtering

Now that we ran a trustdb check forcibly, it no longer pollutes the output, and filtering is no longer required.

Signed-off-by: Christian Hesse <mail@eworm.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 t/t6300-for-each-ref.sh | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
Show changes to t/t6300-for-each-ref.sh +1 −4
diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh
index 5b434ab451..aa3c7c03c4 100755
--- a/t/t6300-for-each-ref.sh
+++ b/t/t6300-for-each-ref.sh
@@ -1763,10 +1763,7 @@ test_expect_success GPGSSH 'setup for signature atom using ssh' '
 '
 
 test_expect_success GPG2 'bare signature atom' '
-	git verify-commit first-signed 2>out.raw &&
-	grep -Ev "checking the trustdb|PGP trust model" out.raw >out &&
-	head -3 out >expect &&
-	tail -1 out >>expect &&
+	git verify-commit first-signed 2>expect &&
 	echo  >>expect &&
 	git for-each-ref refs/tags/first-signed \
 		--format="%(signature)" >actual &&
-- 
2.42.0
Junio C Hamano· Aug 23, 2023, 16:02 UTC · re: Eric Sunshine · lore

Re: [PATCH 2/2] t/t6300: drop magic filtering

Eric Sunshine <sunshine@sunshineco.com> writes:
Show 7 quoted lines
> On Tue, Aug 22, 2023 at 9:03 AM Christian Hesse <list@eworm.de> wrote:
>> Now that we ran a trustdb check forcibly it does no longer pullute the
>> output. Filtering is no longer required...
>
> s/pullute/pollute/
>
>> Signed-off-by: Christian Hesse <mail@eworm.de>

Thanks. Applied the typofix (with removal of the extra double-dots) while queuing.

Junio C Hamano· Aug 22, 2023, 15:50 UTC · re: Christian Hesse · lore

Re: [PATCH v2 1/1] t6300: fix match with insecure memory

Christian Hesse <list@eworm.de> writes:
Show 26 quoted lines
> Kousik Sanagavarapu <five231003@gmail.com> on Tue, 2023/08/22 13:24:
>> Christian Hesse <list@eworm.de> wrote:
>> 
>> > From: Christian Hesse <mail@eworm.de>
>> > 
>> > Running the tests in a build environment makes gnupg print a warning:
>> > 
>> > gpg: Warning: using insecure memory!
>> >
>> > This warning breaks the match, as `head` misses one line. Let's strip
>> > the line, make `head` return what is expected and fix the match.
>> >
>> > Signed-off-by: Christian Hesse <mail@eworm.de>  
>> 
>> I think a bit of an explanation about why this warning is showing up in the
>> commit message would be good.
>> 
>> "man gpg" gives me <stripped>
>> 
>> So it seems that this warning will pop up if gpg is writing memory pages to
>> disk which is bad because as stated above we don't want these pages written
>> to disk which is a security risk.
>
> The Arch Linux packages are built inside a clean container, started via
> systemd-nspawn. Within the container the system call @memlock is not allowed
> by default, for security reasons.

Thanks for Kousik and Christian for discussing this. The phrase "in a build environment" in the proposed log message puzzled me, as the program does not seem to print such warning in my build environment.

And environments where memlock is disabled are probably not limited to containers used to build Arch's packages. "in a build environment" -> "in an enviornment where memlock is disabled" would have avoided puzzling readers.

← back to recent threads