From: "Christian Göttsche" <cgzones@googlemail.com>
To: git@vger.kernel.org
Subject: [RFC PATCH v2] setup: avoid unconditional open syscall with write flags
Date: Tue, 27 Dec 2022 15:32:00 +0100 [thread overview]
Message-ID: <20221227143200.1182341-1-cgzones@googlemail.com> (raw)
Commit 57f5d52a942 ("common-main: call sanitize_stdfds()") added the
sanitization for standard file descriptors (stdin, stdout, stderr) to
all binaries. The lead to all binaries unconditionally opening
/dev/null with the flag O_RDWR (read and write). Most of the time the
standard file descriptors should be set up properly and the sanitization
ends up doing nothing.
There are many git operations, like `git status` or `git stash list`,
which might be called by a parent to gather information about the
repository and should work on a read-only repository. That parent might
run under a seccomp filter to avoid accidental modification or unwanted
command execution on memory corruptions. As part of that seccomp filter
open(2) and openat(2) might be only allowed in read-only mode
(O_RDONLY), thus preventing git's sanitation and stopping the
application.
Check the need of sanitization with a file descriptor in read-only mode,
keep it as replacement for stdin and open replacement file descriptors
for stdout and stderr in write-only mode.
Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
---
v2:
- switch to xopen("/dev/null", O_RDONLY) to stay at 2 syscalls in the
common case and use O_WRONLY for stdout and stderr, as suggested
by René Scharfe
---
setup.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/setup.c b/setup.c
index cefd5f6..c57582b 100644
--- a/setup.c
+++ b/setup.c
@@ -1669,7 +1669,15 @@ const char *resolve_gitdir_gently(const char *suspect, int *return_error_code)
/* if any standard file descriptor is missing open it to /dev/null */
void sanitize_stdfds(void)
{
- int fd = xopen("/dev/null", O_RDWR);
+ int fd;
+
+ fd = xopen("/dev/null", O_RDONLY);
+ if (fd > 0)
+ close(fd);
+ if (fd > 2)
+ return;
+
+ fd = xopen("/dev/null", O_WRONLY);
while (fd < 2)
fd = xdup(fd);
if (fd > 2)
--
2.39.0
next reply other threads:[~2022-12-27 14:32 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-27 14:32 Christian Göttsche [this message]
2022-12-27 14:40 ` [RFC PATCH v2] setup: avoid unconditional open syscall with write flags Ævar Arnfjörð Bjarmason
2022-12-27 20:36 ` René Scharfe
2022-12-27 23:03 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221227143200.1182341-1-cgzones@googlemail.com \
--to=cgzones@googlemail.com \
--cc=git@vger.kernel.org \
/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 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 NNTP newsgroup(s).