Skip to contentSkip to conversation

generic/633: adapt execveat() invocations

PATCH In review Christian Brauner 3 participants 5 messages Jan 31, 2022 – Feb 2, 2022 VFS

lore
Share & tools
lore

Christian Brauner

author maintainer
#0 lore raw

PATCH 1/1 generic/633: adapt execveat() invocations

There's a push by Ariadne to enforce that argv[0] cannot be NULL. So far we've allowed this. Fix the execveat() invocations to set argv[0] to the name of the file we're about to execute.

---
 src/idmapped-mounts/idmapped-mounts.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
src/idmapped-mounts/idmapped-mounts.c +8 -8
index 4cf6c3bb..76b559ae 100644
@@ -3598,7 +3598,7 @@ static int setid_binaries(void)
 			NULL,
 		};
 		static char *argv[] = {
-			NULL,
+			"",
 		};
 
 		if (!expected_uid_gid(t_dir1_fd, FILE1, 0, 5000, 5000))
@@ -3726,7 +3726,7 @@ static int setid_binaries_idmapped_mounts(void)
 			NULL,
 		};
 		static char *argv[] = {
-			NULL,
+			"",
 		};
 
 		if (!expected_uid_gid(open_tree_fd, FILE1, 0, 15000, 15000))
@@ -3865,7 +3865,7 @@ static int setid_binaries_idmapped_mounts_in_userns(void)
 			NULL,
 		};
 		static char *argv[] = {
-			NULL,
+			"",
 		};
 
 		if (!switch_userns(attr.userns_fd, 0, 0, false))
@@ -3924,7 +3924,7 @@ static int setid_binaries_idmapped_mounts_in_userns(void)
 			NULL,
 		};
 		static char *argv[] = {
-			NULL,
+			"",
 		};
 
 		if (!caps_supported()) {
@@ -3992,7 +3992,7 @@ static int setid_binaries_idmapped_mounts_in_userns(void)
 			NULL,
 		};
 		static char *argv[] = {
-			NULL,
+			"",
 		};
 
 		if (!switch_userns(attr.userns_fd, 0, 0, false))
@@ -4150,7 +4150,7 @@ static int setid_binaries_idmapped_mounts_in_userns_separate_userns(void)
 			NULL,
 		};
 		static char *argv[] = {
-			NULL,
+			"",
 		};
 
 		userns_fd = get_userns_fd(0, 10000, 10000);
@@ -4214,7 +4214,7 @@ static int setid_binaries_idmapped_mounts_in_userns_separate_userns(void)
 			NULL,
 		};
 		static char *argv[] = {
-			NULL,
+			"",
 		};
 
 		userns_fd = get_userns_fd(0, 10000, 10000);
@@ -4286,7 +4286,7 @@ static int setid_binaries_idmapped_mounts_in_userns_separate_userns(void)
 			NULL,
 		};
 		static char *argv[] = {
-			NULL,
+			"",
 		};
 
 		userns_fd = get_userns_fd(0, 10000, 10000);

base-commit: d8dee1222ecdfa1cff1386a61248e587eb3b275d

Signature · 1 line
2.32.0
#1 lore raw
Quoted 3 lines · Christian Brauner

There's a push by Ariadne to enforce that argv[0] cannot be NULL. So far we've allowed this. Fix the execveat() invocations to set argv[0] to the name of the file we're about to execute.

To be clear, these tests are also trying to launch set-id binaries with argc == 0, so narrowing the kernel check to only set-id binaries wouldn't help here, yes?

-Kees

Quoted 98 lines
---
 src/idmapped-mounts/idmapped-mounts.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
src/idmapped-mounts/idmapped-mounts.c +8 -8
index 4cf6c3bb..76b559ae 100644
@@ -3598,7 +3598,7 @@ static int setid_binaries(void)
 			NULL,
 		};
 		static char *argv[] = {
-			NULL,
+			"",
 		};
 
 		if (!expected_uid_gid(t_dir1_fd, FILE1, 0, 5000, 5000))
@@ -3726,7 +3726,7 @@ static int setid_binaries_idmapped_mounts(void)
 			NULL,
 		};
 		static char *argv[] = {
-			NULL,
+			"",
 		};
 
 		if (!expected_uid_gid(open_tree_fd, FILE1, 0, 15000, 15000))
@@ -3865,7 +3865,7 @@ static int setid_binaries_idmapped_mounts_in_userns(void)
 			NULL,
 		};
 		static char *argv[] = {
-			NULL,
+			"",
 		};
 
 		if (!switch_userns(attr.userns_fd, 0, 0, false))
@@ -3924,7 +3924,7 @@ static int setid_binaries_idmapped_mounts_in_userns(void)
 			NULL,
 		};
 		static char *argv[] = {
-			NULL,
+			"",
 		};
 
 		if (!caps_supported()) {
@@ -3992,7 +3992,7 @@ static int setid_binaries_idmapped_mounts_in_userns(void)
 			NULL,
 		};
 		static char *argv[] = {
-			NULL,
+			"",
 		};
 
 		if (!switch_userns(attr.userns_fd, 0, 0, false))
@@ -4150,7 +4150,7 @@ static int setid_binaries_idmapped_mounts_in_userns_separate_userns(void)
 			NULL,
 		};
 		static char *argv[] = {
-			NULL,
+			"",
 		};
 
 		userns_fd = get_userns_fd(0, 10000, 10000);
@@ -4214,7 +4214,7 @@ static int setid_binaries_idmapped_mounts_in_userns_separate_userns(void)
 			NULL,
 		};
 		static char *argv[] = {
-			NULL,
+			"",
 		};
 
 		userns_fd = get_userns_fd(0, 10000, 10000);
@@ -4286,7 +4286,7 @@ static int setid_binaries_idmapped_mounts_in_userns_separate_userns(void)
 			NULL,
 		};
 		static char *argv[] = {
-			NULL,
+			"",
 		};
 
 		userns_fd = get_userns_fd(0, 10000, 10000);

base-commit: d8dee1222ecdfa1cff1386a61248e587eb3b275d

Signature · 1 line
2.32.0
Signature · 1 line
Kees Cook
author maintainer
#2 lore raw
Quoted 8 lines · Kees Cook
Quoted 3 lines · Christian Brauner

There's a push by Ariadne to enforce that argv[0] cannot be NULL. So far we've allowed this. Fix the execveat() invocations to set argv[0] to the name of the file we're about to execute.

To be clear, these tests are also trying to launch set-id binaries with argc == 0, so narrowing the kernel check to only set-id binaries wouldn't help here, yes?

Yes, that wouldn't help.
The new approach of mutating argv { NULL } into { "", NULL } is better.

#3 lore raw
In reply to Christian Brauner

From: Christian Brauner

Quoted 6 lines

Sent: 31 January 2022 17:10

There's a push by Ariadne to enforce that argv[0] cannot be NULL. So far we've allowed this. Fix the execveat() invocations to set argv[0] to the name of the file we're about to execute.

...

Quoted 8 lines
 src/idmapped-mounts/idmapped-mounts.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
src/idmapped-mounts/idmapped-mounts.c +0 -0
index 4cf6c3bb..76b559ae 100644

src/idmapped-mounts/idmapped-mounts.c static int setid_binaries(void) · line 3602

Quoted 6 lines
src/idmapped-mounts/idmapped-mounts.c +1 -1
@@ -3598,7 +3598,7 @@ static int setid_binaries(void)
 			NULL,
 		};
 		static char *argv[] = {
-			NULL,
+			"",
 		};

Isn't that just plain wrong?
argv[] needs to be terminated by a NULL so you need to add the "" before the NULL not replace the NULL by it.

Quite how this matches the patch description is another matter...

David

-
Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK Registration No: 1397386 (Wales)

author maintainer
#4 lore raw
Quoted 27 lines · David Laight

From: Christian Brauner

Quoted 6 lines

Sent: 31 January 2022 17:10

There's a push by Ariadne to enforce that argv[0] cannot be NULL. So far we've allowed this. Fix the execveat() invocations to set argv[0] to the name of the file we're about to execute.

...

Quoted 8 lines
 src/idmapped-mounts/idmapped-mounts.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
src/idmapped-mounts/idmapped-mounts.c +0 -0
index 4cf6c3bb..76b559ae 100644

src/idmapped-mounts/idmapped-mounts.c static int setid_binaries(void) · line 3602

Quoted 6 lines
src/idmapped-mounts/idmapped-mounts.c +1 -1
@@ -3598,7 +3598,7 @@ static int setid_binaries(void)
 			NULL,
 		};
 		static char *argv[] = {
-			NULL,
+			"",
 		};

Isn't that just plain wrong?
argv[] needs to be terminated by a NULL so you need to add the "" before the NULL not replace the NULL by it.

Quoted 1 line

Quite how this matches the patch description is another matter...

Bah, braino. I fired that too quickly.