From: Vivek Goyal <vgoyal@redhat.com>
To: qemu-devel@nongnu.org
Cc: berrange@redhat.com, vromanso@redhat.com, dwalsh@redhat.com,
dgilbert@redhat.com, virtio-fs@redhat.com, stefanha@redhat.com,
vgoyal@redhat.com
Subject: [PATCH v2 2/5] virtiofsd: create lock/pid file in per user cache dir
Date: Thu, 30 Jul 2020 15:47:33 -0400 [thread overview]
Message-ID: <20200730194736.173994-3-vgoyal@redhat.com> (raw)
In-Reply-To: <20200730194736.173994-1-vgoyal@redhat.com>
Right now we create lock/pid file in /usr/local/var/... and unprivliged
user does not have access to create files there.
Hence, in unprivileged mode, create this file in per user cache dir
as specified by environment variable XDG_RUNTIME_DIR.
Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
---
tools/virtiofsd/fuse_virtio.c | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/tools/virtiofsd/fuse_virtio.c b/tools/virtiofsd/fuse_virtio.c
index 6b21a93841..1551a94757 100644
--- a/tools/virtiofsd/fuse_virtio.c
+++ b/tools/virtiofsd/fuse_virtio.c
@@ -972,8 +972,21 @@ static bool fv_socket_lock(struct fuse_session *se)
g_autofree gchar *pidfile = NULL;
g_autofree gchar *dir = NULL;
Error *local_err = NULL;
+ gboolean unprivileged = false;
- dir = qemu_get_local_state_pathname("run/virtiofsd");
+ if (geteuid() != 0)
+ unprivileged = true;
+
+ /*
+ * Unpriviliged users don't have access to /usr/local/var. Hence
+ * store lock/pid file in per user cache directory. Use environment
+ * variable XDG_RUNTIME_DIR.
+ */
+ if (unprivileged) {
+ dir = g_strdup_printf("%s/virtiofsd", g_get_user_runtime_dir());
+ } else {
+ dir = qemu_get_local_state_pathname("run/virtiofsd");
+ }
if (g_mkdir_with_parents(dir, S_IRWXU) < 0) {
fuse_log(FUSE_LOG_ERR, "%s: Failed to create directory %s: %s",
--
2.25.4
next prev parent reply other threads:[~2020-07-30 19:51 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-30 19:47 [PATCH v2 0/5] virtiofsd: Add a unprivileged passthrough mode Vivek Goyal
2020-07-30 19:47 ` [PATCH v2 1/5] virtiofsd: Add notion of unprivileged mode Vivek Goyal
2020-08-07 16:33 ` Dr. David Alan Gilbert
2020-07-30 19:47 ` Vivek Goyal [this message]
2020-08-07 17:34 ` [PATCH v2 2/5] virtiofsd: create lock/pid file in per user cache dir Dr. David Alan Gilbert
2020-07-30 19:47 ` [PATCH v2 3/5] virtiofsd: open /proc/self/fd/ in sandbox=NONE mode Vivek Goyal
2020-08-07 17:42 ` Dr. David Alan Gilbert
2020-07-30 19:47 ` [PATCH v2 4/5] virtiofsd: Open lo->source while setting up root " Vivek Goyal
2020-08-03 9:54 ` Stefan Hajnoczi
2020-08-03 13:57 ` Vivek Goyal
2020-08-04 10:36 ` Stefan Hajnoczi
2020-07-30 19:47 ` [PATCH v2 5/5] virtiofsd: Skip setup_capabilities() " Vivek Goyal
2020-08-07 17:58 ` Dr. David Alan Gilbert
2020-08-03 9:45 ` [PATCH v2 0/5] virtiofsd: Add a unprivileged passthrough mode Stefan Hajnoczi
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=20200730194736.173994-3-vgoyal@redhat.com \
--to=vgoyal@redhat.com \
--cc=berrange@redhat.com \
--cc=dgilbert@redhat.com \
--cc=dwalsh@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
--cc=virtio-fs@redhat.com \
--cc=vromanso@redhat.com \
/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).