From: YAMAMOTO Takashi <yamamoto@midokura.com>
To: qemu-devel@nongnu.org
Cc: YAMAMOTO Takashi <yamamoto@midokura.com>,
Laurent Vivier <laurent@vivier.eu>
Subject: [PATCH v2 08/11] linux-user: Implement exec of /proc/$pid/exe of qemu process
Date: Mon, 31 May 2021 14:50:15 +0900 [thread overview]
Message-ID: <20210531055019.10149-9-yamamoto@midokura.com> (raw)
In-Reply-To: <20210531055019.10149-1-yamamoto@midokura.com>
dockerd makes runc invoke dockerd using /proc/$pid/exe.
This commit makes it work when both of dockerd and runc are
emulated by qemu linux-user.
In that case, we (the qemu interpreting runc) need to invoke the
real executable (dockerd), where /proc/$pid/exe in question is
the qemu command interpreting dockerd.
Signed-off-by: YAMAMOTO Takashi <yamamoto@midokura.com>
---
linux-user/syscall.c | 59 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 59 insertions(+)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 86b12cc8b4..6f9161dbe4 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -7988,10 +7988,69 @@ static int open_self_auxv(void *cpu_env, int fd)
static const char *get_exe_path(int pid, char *buf, size_t bufsize)
{
+ ssize_t ssz;
+ int fd;
+
if (pid == getpid()) {
return exec_path;
}
+ /* dockerd makes runc invoke dockerd using "/proc/${dockerd_pid}/exe". */
+ snprintf(buf, bufsize, "/proc/%d/cmdline", pid);
+ fd = open(buf, O_RDONLY);
+ if (fd == -1) {
+ return NULL;
+ }
+ ssz = read(fd, buf, bufsize);
+ if (ssz != -1) {
+ const char *argv0;
+ const char *argv1;
+ const char *cp;
+ const char *ep;
+ const char *slash;
+
+ cp = buf;
+ ep = cp + ssz;
+
+ argv0 = cp;
+ while (*cp != 0) {
+ cp++;
+ if (cp >= ep) {
+ goto fail;
+ }
+ }
+
+ cp++;
+ if (cp >= ep) {
+ goto fail;
+ }
+
+ argv1 = cp;
+ while (*cp != 0) {
+ cp++;
+ if (cp >= ep) {
+ goto fail;
+ }
+ }
+
+ /*
+ * XXX a bit too loose detection of qemu.
+ * maybe we can compare /proc/$pid/exe with ours.
+ */
+ slash = strrchr(argv0, '/');
+ if (slash != NULL) {
+ argv0 = slash + 1; /* basename */
+ }
+ if (strncmp(argv0, "qemu-", sizeof("qemu-") - 1)) {
+ goto fail;
+ }
+
+ close(fd);
+ return argv1;
+ }
+fail:
+ close(fd);
+
return NULL;
}
--
2.21.1 (Apple Git-122.3)
next prev parent reply other threads:[~2021-05-31 5:55 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-31 5:50 [PATCH v2 00/11] linux-user changes to run docker YAMAMOTO Takashi
2021-05-31 5:50 ` [PATCH v2 01/11] linux-user: handle /proc/self/exe for execve YAMAMOTO Takashi
2021-06-20 14:14 ` Laurent Vivier
2021-06-21 2:02 ` Takashi Yamamoto
2021-06-22 13:47 ` Laurent Vivier
2021-05-31 5:50 ` [PATCH v2 02/11] linux-user: Fix the execfd case of /proc/self/exe open YAMAMOTO Takashi
2021-06-20 14:16 ` Laurent Vivier
2021-06-21 1:19 ` Takashi Yamamoto
2021-05-31 5:50 ` [PATCH v2 03/11] linux-user: dup the execfd on start up YAMAMOTO Takashi
2021-05-31 5:50 ` [PATCH v2 04/11] linux-user: make exec_path realpath YAMAMOTO Takashi
2021-05-31 5:50 ` [PATCH v2 05/11] linux-user: Implement pivot_root YAMAMOTO Takashi
2021-06-20 14:02 ` Laurent Vivier
2021-06-20 14:05 ` Laurent Vivier
2021-05-31 5:50 ` [PATCH v2 06/11] linux-user: add get_exe_path YAMAMOTO Takashi
2021-05-31 5:50 ` [PATCH v2 07/11] linux-user: simplify is_proc_myself YAMAMOTO Takashi
2021-05-31 5:50 ` YAMAMOTO Takashi [this message]
2021-05-31 5:50 ` [PATCH v2 09/11] linux-user: Make the qemu detection for /proc/$pid/exe a bit conservative YAMAMOTO Takashi
2021-05-31 5:50 ` [PATCH v2 10/11] linux-user: a crude hack for libcontainer (CLONE_PARENT) [!MERGE] YAMAMOTO Takashi
2021-05-31 5:50 ` [PATCH v2 11/11] linux-user: always assume preserve_argv0 for now [!MERGE] YAMAMOTO Takashi
2021-05-31 6:07 ` [PATCH v2 00/11] linux-user changes to run docker no-reply
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=20210531055019.10149-9-yamamoto@midokura.com \
--to=yamamoto@midokura.com \
--cc=laurent@vivier.eu \
--cc=qemu-devel@nongnu.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).