From: "M. Mohan Kumar" <mohan@in.ibm.com>
To: qemu-devel@nongnu.org
Cc: "M. Mohan Kumar" <mohan@in.ibm.com>
Subject: [Qemu-devel] [V11 08/15] virtio-9p: Removing file or directory in chroot environment
Date: Fri, 24 Jun 2011 13:52:17 +0530 [thread overview]
Message-ID: <1308903744-2870-9-git-send-email-mohan@in.ibm.com> (raw)
In-Reply-To: <1308903744-2870-1-git-send-email-mohan@in.ibm.com>
From: "M. Mohan Kumar" <mohan@in.ibm.com>
Support for removing file or directory in chroot environment. Add
interfaces to remove file/directory in chroot worker and qemu side.
Signed-off-by: M. Mohan Kumar <mohan@in.ibm.com>
---
hw/9pfs/virtio-9p-chroot-worker.c | 18 ++++++++++++++++++
hw/9pfs/virtio-9p-chroot.h | 1 +
hw/9pfs/virtio-9p-local.c | 4 ++++
3 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/hw/9pfs/virtio-9p-chroot-worker.c b/hw/9pfs/virtio-9p-chroot-worker.c
index 10f290d..f269c7b 100644
--- a/hw/9pfs/virtio-9p-chroot-worker.c
+++ b/hw/9pfs/virtio-9p-chroot-worker.c
@@ -169,6 +169,21 @@ unset_uid:
return retval;
}
+/*
+ * Remove a file object
+ * Returns 0 on success and -errno on failure
+ */
+static int chroot_do_remove(V9fsFileObjectRequest *request)
+{
+ int retval;
+
+ retval = remove(request->path.path);
+ if (retval < 0) {
+ return -errno;
+ }
+ return 0;
+}
+
static void chroot_daemonize(int chroot_sock)
{
sigset_t sigset;
@@ -272,6 +287,9 @@ int v9fs_chroot(FsContext *fs_ctx)
case T_MKNOD:
retval = chroot_do_create_special(&request);
break;
+ case T_REMOVE:
+ retval = chroot_do_remove(&request);
+ break;
default:
retval = -1;
break;
diff --git a/hw/9pfs/virtio-9p-chroot.h b/hw/9pfs/virtio-9p-chroot.h
index 9075361..9d69739 100644
--- a/hw/9pfs/virtio-9p-chroot.h
+++ b/hw/9pfs/virtio-9p-chroot.h
@@ -9,6 +9,7 @@
#define T_MKNOD 4
#define T_SYMLINK 5
#define T_LINK 6
+#define T_REMOVE 7
#define V9FS_FD_VALID INT_MAX
diff --git a/hw/9pfs/virtio-9p-local.c b/hw/9pfs/virtio-9p-local.c
index a1eff5f..f2d66e1 100644
--- a/hw/9pfs/virtio-9p-local.c
+++ b/hw/9pfs/virtio-9p-local.c
@@ -617,6 +617,10 @@ static int local_utimensat(FsContext *s, V9fsPath *fs_path,
static int local_remove(FsContext *ctx, const char *path)
{
char buffer[PATH_MAX];
+
+ if (ctx->fs_sm == SM_PASSTHROUGH) {
+ return passthrough_request(ctx, NULL, path, 0, NULL, T_REMOVE);
+ }
return remove(rpath(ctx, path, buffer));
}
--
1.7.5.4
next prev parent reply other threads:[~2011-06-24 8:22 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-24 8:22 [Qemu-devel] [V11 00/15] virtio-9p: Use chroot to safely access files in passthrough security model M. Mohan Kumar
2011-06-24 8:22 ` [Qemu-devel] [V11 01/15] Implement qemu_read_full M. Mohan Kumar
2011-06-24 8:22 ` [Qemu-devel] [V11 02/15] virtio-9p: Enable CONFIG_THREAD if CONFIG_VIRTFS is enabled M. Mohan Kumar
2011-06-24 8:22 ` [Qemu-devel] [V11 03/15] virtio-9p: Provide chroot worker side interfaces M. Mohan Kumar
2011-06-24 8:22 ` [Qemu-devel] [V11 04/15] virtio-9p: qemu interfaces for chroot environment M. Mohan Kumar
2011-06-24 8:22 ` [Qemu-devel] [V11 05/15] virtio-9p: Support for opening a file in " M. Mohan Kumar
2011-06-24 8:22 ` [Qemu-devel] [V11 06/15] virtio-9p: Create support " M. Mohan Kumar
2011-06-24 8:22 ` [Qemu-devel] [V11 07/15] virtio-9p: Creating special files " M. Mohan Kumar
2011-06-24 8:22 ` M. Mohan Kumar [this message]
2011-06-24 8:22 ` [Qemu-devel] [V11 09/15] virtio-9p: Rename " M. Mohan Kumar
2011-06-24 8:22 ` [Qemu-devel] [V11 10/15] virtio-9p: Move file post creation changes to none security model M. Mohan Kumar
2011-06-24 8:22 ` [Qemu-devel] [V11 11/15] virtio-9p: chmod in chroot environment M. Mohan Kumar
2011-06-24 8:22 ` [Qemu-devel] [V11 12/15] virtio-9p: chown " M. Mohan Kumar
2011-06-24 8:22 ` [Qemu-devel] [V11 13/15] virtio-9p: stat " M. Mohan Kumar
2011-06-24 8:22 ` [Qemu-devel] [V11 14/15] virtio-9p: readlink " M. Mohan Kumar
2011-06-24 8:22 ` [Qemu-devel] [V11 15/15] virtio-9p: Chroot environment for other functions M. Mohan Kumar
2011-06-26 18:22 ` [Qemu-devel] [V11 00/15] virtio-9p: Use chroot to safely access files in passthrough security model Blue Swirl
2011-06-27 5:28 ` M. Mohan Kumar
2011-07-25 8:17 ` 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=1308903744-2870-9-git-send-email-mohan@in.ibm.com \
--to=mohan@in.ibm.com \
--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).