From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=34805 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PuYSv-0003Zk-Ej for qemu-devel@nongnu.org; Tue, 01 Mar 2011 17:54:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PuYSu-0001lC-4X for qemu-devel@nongnu.org; Tue, 01 Mar 2011 17:54:49 -0500 Received: from e32.co.us.ibm.com ([32.97.110.150]:46493) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PuYSt-0001l6-Sh for qemu-devel@nongnu.org; Tue, 01 Mar 2011 17:54:48 -0500 Received: from d03relay02.boulder.ibm.com (d03relay02.boulder.ibm.com [9.17.195.227]) by e32.co.us.ibm.com (8.14.4/8.13.1) with ESMTP id p21MiEu6023255 for ; Tue, 1 Mar 2011 15:44:14 -0700 Received: from d03av02.boulder.ibm.com (d03av02.boulder.ibm.com [9.17.195.168]) by d03relay02.boulder.ibm.com (8.13.8/8.13.8/NCO v9.1) with ESMTP id p21MshJF103684 for ; Tue, 1 Mar 2011 15:54:44 -0700 Received: from d03av02.boulder.ibm.com (loopback [127.0.0.1]) by d03av02.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p21MshNX026063 for ; Tue, 1 Mar 2011 15:54:43 -0700 Message-ID: <4D6D7946.4010207@linux.vnet.ibm.com> Date: Tue, 01 Mar 2011 14:55:02 -0800 From: "Venkateswararao Jujjuri (JV)" MIME-Version: 1.0 Subject: Re: [Qemu-devel] [V6 PATCH 6/9] virtio-9p: Create support in chroot environment References: <1298892156-11667-1-git-send-email-mohan@in.ibm.com> <1298892156-11667-7-git-send-email-mohan@in.ibm.com> In-Reply-To: <1298892156-11667-7-git-send-email-mohan@in.ibm.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "M. Mohan Kumar" Cc: Stefan Hajnoczi , qemu-devel@nongnu.org On 2/28/2011 3:22 AM, M. Mohan Kumar wrote: > Add both chroot deamon & qemu side interfaces to create regular files in > chroot environment > > Signed-off-by: M. Mohan Kumar > --- > hw/9pfs/virtio-9p-chroot-dm.c | 39 +++++++++++++++++++++++++++++++++++++++ > hw/9pfs/virtio-9p-local.c | 21 +++++++++++++++++++-- > 2 files changed, 58 insertions(+), 2 deletions(-) > > diff --git a/hw/9pfs/virtio-9p-chroot-dm.c b/hw/9pfs/virtio-9p-chroot-dm.c > index c1d8c6e..985d42b 100644 > --- a/hw/9pfs/virtio-9p-chroot-dm.c > +++ b/hw/9pfs/virtio-9p-chroot-dm.c > @@ -83,6 +83,42 @@ static void chroot_do_open(V9fsFileObjectRequest *request, FdInfo *fd_info) > } > } > > +/* > + * Helper routine to create a file and return the file descriptor and > + * error status in FdInfo structure. > + */ > +static void chroot_do_create(V9fsFileObjectRequest *request, FdInfo *fd_info) > +{ > + uid_t cur_uid; > + gid_t cur_gid; > + > + cur_uid = geteuid(); > + cur_gid = getegid(); > + > + fd_info->fi_fd = -1; > + > + if (setfsuid(request->data.uid) < 0) { > + fd_info->fi_fd = -errno; > + fd_info->fi_flags = FI_FD_INVALID; > + return; > + } > + if (setfsgid(request->data.gid) < 0) { > + fd_info->fi_fd = -errno; > + fd_info->fi_flags = FI_FD_INVALID; > + goto unset_uid; > + } > + > + fd_info->fi_fd = open(request->path.path, request->data.flags, > + request->data.mode); > + if (fd_info->fi_fd < 0) { > + fd_info->fi_fd = -errno; > + fd_info->fi_flags = FI_FD_INVALID; > + } > + setfsgid(cur_gid); > +unset_uid: > + setfsuid(cur_uid); > +} > + > static int chroot_daemonize(int chroot_sock) > { > sigset_t sigset; > @@ -177,6 +213,9 @@ int v9fs_chroot(FsContext *fs_ctx) > case T_OPEN: > chroot_do_open(&request, &fd_info); > break; > + case T_CREATE: > + chroot_do_create(&request, &fd_info); > + break; > default: > fd_info.fi_flags = FI_FD_SOCKERR; > break; > diff --git a/hw/9pfs/virtio-9p-local.c b/hw/9pfs/virtio-9p-local.c > index 0c55d35..3fed16c 100644 > --- a/hw/9pfs/virtio-9p-local.c > +++ b/hw/9pfs/virtio-9p-local.c > @@ -58,6 +58,22 @@ static int passthrough_open(FsContext *fs_ctx, const char *path, int flags) > return fd; > } > > +static int passthrough_create(FsContext *fs_ctx, const char *path, int flags, > + FsCred *credp) > +{ > + V9fsFileObjectRequest request; > + int fd; > + > + fd = fill_fileobjectrequest(&request, path, credp); > + if (fd < 0) { > + return fd; Here fd is -errno; Need to assign it back to errno before returning. You took care of it in passthrough_open() but not here. Please check other places where this logic applies. - JV > + } > + request.data.flags = flags; > + request.data.type = T_CREATE; > + fd = v9fs_request(fs_ctx, &request); > + return fd; > +} > + > static int local_lstat(FsContext *fs_ctx, const char *path, struct stat *stbuf) > { > int err; > @@ -382,8 +398,7 @@ static int local_open2(FsContext *fs_ctx, const char *path, int flags, > serrno = errno; > goto err_end; > } > - } else if ((fs_ctx->fs_sm == SM_PASSTHROUGH) || > - (fs_ctx->fs_sm == SM_NONE)) { > + } else if (fs_ctx->fs_sm == SM_NONE) { > fd = open(rpath(fs_ctx, path), flags, credp->fc_mode); > if (fd == -1) { > return fd; > @@ -393,6 +408,8 @@ static int local_open2(FsContext *fs_ctx, const char *path, int flags, > serrno = errno; > goto err_end; > } > + } else if (fs_ctx->fs_sm == SM_PASSTHROUGH) { > + fd = passthrough_create(fs_ctx, path, flags, credp); > } > return fd; >