From: ulfvonbelow <striness@tilde.club>
To: 65221@debbugs.gnu.org
Cc: ulfvonbelow <striness@tilde.club>
Subject: [bug#65221] [PATCH 5/6] service: use RECONFIGURE-FDS for redirecting FDs 0-2.
Date: Fri, 18 Aug 2023 15:22:38 -0500 [thread overview]
Message-ID: <20230818202239.21177-5-striness@tilde.club> (raw)
In-Reply-To: <20230818202239.21177-1-striness@tilde.club>
There are currently some corner cases in how EXTRA-PORTS works due to it not
managing FDs 0, 1, and 2. Specifically, if one were to include a port in
EXTRA-PORTS with FD 0, 1, or 2, it would *not* be preserved, and would instead
represent the file that EXEC-COMMAND assigned to that file descriptor. To
avoid this, it's necessary to call RECONFIGURE-FDS *before* redirecting the
input, but this could clobber LOG-PORT or INPUT-PORT, so it would become
necessary to include LOG-PORT and INPUT-PORT in the call to RECONFIGURE-FDS,
then do the redirection using the new FD assignment, then close them. This
complication can be avoided if we simply let RECONFIGURE-FDS itself do the
redirection. This also solves other edge cases, like if LOG-PORT has fileno 0
or 1 (previously passing a LOG-PORT of (current-output-port) would cause an
error, as the underlying file descriptor would be closed before dup2 was
called to copy it), or if INPUT-PORT has fileno 0.
To solve this, we have RECONFIGURE-FDS start the range it copies into at 0
instead of 3. We then explicitly pass the desired standard I/O FDs / ports at
the front of the list passed to RECONFIGURE-FDS.
We also use O_CLOEXEC for opening /dev/null and the log file so that the file
descriptors they are originally opened on don't hang around.
* modules/shepherd/service.scm (exec-command): use RECONFIGURE-FDS for
redirecting FDs 0, 1, and 2.
---
modules/shepherd/service.scm | 62 +++++++++++++++++-------------------
1 file changed, 30 insertions(+), 32 deletions(-)
diff --git a/modules/shepherd/service.scm b/modules/shepherd/service.scm
index e816cd1..3008e31 100644
--- a/modules/shepherd/service.scm
+++ b/modules/shepherd/service.scm
@@ -1561,38 +1561,36 @@ false."
(chdir directory)
(environ environment-variables)
- ;; Redirect stdin.
- (catch-system-error (close-fdes 0))
- ;; Make sure file descriptor zero is used, so we don't end up reusing
- ;; it for something unrelated, which can confuse some packages.
- (dup2 (if input-port
- (fileno input-port)
- (open-fdes "/dev/null" O_RDONLY))
- 0)
-
- (when (or log-port log-file)
- (catch #t
- (lambda ()
- ;; Redirect stdout and stderr to use LOG-FILE.
- (catch-system-error (close-fdes 1))
- (catch-system-error (close-fdes 2))
- (dup2 (if log-file
- (open-fdes log-file (logior O_CREAT O_WRONLY O_APPEND)
- #o640)
- (fileno log-port))
- 1)
- (dup2 1 2))
-
- (lambda (key . args)
- (when log-file
- (format (current-error-port)
- "failed to open log-file ~s:~%" log-file))
- (print-exception (current-error-port) #f key args)
- (primitive-exit 1))))
-
- ;; Make EXTRA-PORTS available starting from file descriptor 3.
- ;; This clears their FD_CLOEXEC flag.
- (reconfigure-fds extra-ports 3)
+ (let* ( ;; Make sure file descriptor zero is used, so we don't end up reusing
+ ;; it for something unrelated, which can confuse some packages.
+ (stdin (or input-port (open-fdes "/dev/null"
+ (logior O_RDONLY
+ O_CLOEXEC))))
+ (stdout (catch #t
+ (lambda ()
+ (or log-port
+ (and log-file
+ (open-fdes log-file
+ (logior O_CREAT O_WRONLY O_APPEND
+ O_CLOEXEC)
+ #o640))
+ 1))
+ (lambda (key . args)
+ (when log-file
+ (format (current-error-port)
+ "failed to open log-file ~s:~%" log-file))
+ (print-exception (current-error-port) #f key args)
+ (primitive-exit 1))))
+ (stderr (if (or log-port log-file)
+ stdout
+ 2))
+ (all-fds (+ 3 (length extra-ports))))
+ ;; Make EXTRA-PORTS available starting from file descriptor 3.
+ ;; This clears their FD_CLOEXEC flag.
+ (reconfigure-fds (cons* stdin
+ stdout
+ stderr
+ extra-ports)))
;; setgid must be done *before* setuid, otherwise the user will
;; likely no longer have permissions to setgid.
--
2.40.1
next prev parent reply other threads:[~2023-08-18 20:24 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-11 9:03 [bug#65221] [PATCH 0/2] Fix EXTRA-PORTS edge cases ulfvonbelow
2023-08-11 9:06 ` [bug#65221] [PATCH 1/2] service: make EXTRA-PORTS work as advertised ulfvonbelow
2023-08-11 9:06 ` [bug#65221] [PATCH 2/2] service: use PRESERVE-PORTS for redirecting FDs 0-2 ulfvonbelow
2023-08-15 10:55 ` [bug#65221] [PATCH 0/2] Fix EXTRA-PORTS edge cases Ludovic Courtès
2023-08-18 20:21 ` Ulf Herrman
2023-08-18 20:22 ` [bug#65221] [PATCH 1/6] tests: add extra-ports.sh test ulfvonbelow
2023-08-18 20:22 ` [bug#65221] [PATCH 2/6] service: don't let earlier ports clobber later ones in EXTRA-PORTS ulfvonbelow
2023-08-18 20:22 ` [bug#65221] [PATCH 3/6] Makefile.am: enable extra-ports.sh test ulfvonbelow
2023-08-18 20:22 ` [bug#65221] [PATCH 4/6] service: honor EXTRA-PORTS regardless of log-port and log-file ulfvonbelow
2023-08-18 20:22 ` ulfvonbelow [this message]
2023-08-18 20:22 ` [bug#65221] [PATCH 6/6] service: exec-command: close other file descriptors by default ulfvonbelow
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: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230818202239.21177-5-striness@tilde.club \
--to=striness@tilde.club \
--cc=65221@debbugs.gnu.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.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.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).