From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33841) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W87pJ-0000Pt-Jq for qemu-devel@nongnu.org; Tue, 28 Jan 2014 07:31:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W87pB-0005Am-GO for qemu-devel@nongnu.org; Tue, 28 Jan 2014 07:31:37 -0500 Received: from e28smtp03.in.ibm.com ([122.248.162.3]:43367) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W87pA-0005AL-Pp for qemu-devel@nongnu.org; Tue, 28 Jan 2014 07:31:29 -0500 Received: from /spool/local by e28smtp03.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 28 Jan 2014 18:01:25 +0530 Received: from d28relay04.in.ibm.com (d28relay04.in.ibm.com [9.184.220.61]) by d28dlp03.in.ibm.com (Postfix) with ESMTP id A730A1258054 for ; Tue, 28 Jan 2014 18:03:06 +0530 (IST) Received: from d28av02.in.ibm.com (d28av02.in.ibm.com [9.184.220.64]) by d28relay04.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id s0SCVJhn28311742 for ; Tue, 28 Jan 2014 18:01:20 +0530 Received: from d28av02.in.ibm.com (localhost [127.0.0.1]) by d28av02.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id s0SCVJNV025670 for ; Tue, 28 Jan 2014 18:01:19 +0530 From: "Aneesh Kumar K.V" In-Reply-To: <52E7916C.8050305@redhat.com> References: <1390906551-4845-1-git-send-email-kirill.shutemov@linux.intel.com> <52E7916C.8050305@redhat.com> Date: Tue, 28 Jan 2014 18:01:18 +0530 Message-ID: <87sis81e5l.fsf@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain Subject: Re: [Qemu-devel] [PATCH] [RESEND-try-3] hw/9pfs: fix P9_STATS_GEN handling List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini , "Kirill A. Shutemov" , qemu-devel@nongnu.org, aliguori@amazon.com Cc: armbru@redhat.com, "Michael S. Tsirkin" Paolo Bonzini writes: > Il 28/01/2014 11:55, Kirill A. Shutemov ha scritto: >> Currently we have few issues with P9_STATS_GEN: >> >> - We don't try to read st_gen anything except files or directories, but >> still set P9_STATS_GEN bit in st_result_mask. It may mislead client: >> we present garbage as valid st_gen. >> >> - If we failed to get valid st_gen with ENOTTY, we ignore error, but >> still set P9_STATS_GEN bit in st_result_mask. >> >> - If we failed to get valid st_gen with any other errno, we fail >> getattr altogether. It's excessive: we block valid client use-cases, >> like chdir(2) to non-readable directory with execution bit set. >> >> The patch fixes these issues and cleanup code a bit. >> >> Signed-off-by: Kirill A. Shutemov >> Reviewed-by: Daniel P. Berrange >> Reviewed-by: Aneesh Kumar K.V >> --- >> hw/9pfs/cofile.c | 4 ---- >> hw/9pfs/virtio-9p-handle.c | 8 +++++++- >> hw/9pfs/virtio-9p-local.c | 10 ++++++---- >> hw/9pfs/virtio-9p-proxy.c | 3 ++- >> hw/9pfs/virtio-9p.c | 12 ++++++++++-- >> 5 files changed, 25 insertions(+), 12 deletions(-) >> >> diff --git a/hw/9pfs/cofile.c b/hw/9pfs/cofile.c >> index 194c1306c665..2efebf35710f 100644 >> --- a/hw/9pfs/cofile.c >> +++ b/hw/9pfs/cofile.c >> @@ -38,10 +38,6 @@ int v9fs_co_st_gen(V9fsPDU *pdu, V9fsPath *path, mode_t st_mode, >> }); >> v9fs_path_unlock(s); >> } >> - /* The ioctl may not be supported depending on the path */ >> - if (err == -ENOTTY) { >> - err = 0; >> - } >> return err; >> } >> >> diff --git a/hw/9pfs/virtio-9p-handle.c b/hw/9pfs/virtio-9p-handle.c >> index fe8e0ed19dcc..17002a3d2867 100644 >> --- a/hw/9pfs/virtio-9p-handle.c >> +++ b/hw/9pfs/virtio-9p-handle.c >> @@ -582,6 +582,7 @@ static int handle_unlinkat(FsContext *ctx, V9fsPath *dir, >> static int handle_ioc_getversion(FsContext *ctx, V9fsPath *path, >> mode_t st_mode, uint64_t *st_gen) >> { >> +#ifdef FS_IOC_GETVERSION >> int err; >> V9fsFidOpenState fid_open; >> >> @@ -590,7 +591,8 @@ static int handle_ioc_getversion(FsContext *ctx, V9fsPath *path, >> * We can get fd for regular files and directories only >> */ >> if (!S_ISREG(st_mode) && !S_ISDIR(st_mode)) { >> - return 0; >> + errno = ENOTTY; >> + return -1; >> } >> err = handle_open(ctx, path, O_RDONLY, &fid_open); >> if (err < 0) { >> @@ -599,6 +601,10 @@ static int handle_ioc_getversion(FsContext *ctx, V9fsPath *path, >> err = ioctl(fid_open.fd, FS_IOC_GETVERSION, st_gen); >> handle_close(ctx, &fid_open); >> return err; >> +#else >> + errno = ENOTTY; >> + return -1; >> +#endif >> } >> >> static int handle_init(FsContext *ctx) >> diff --git a/hw/9pfs/virtio-9p-local.c b/hw/9pfs/virtio-9p-local.c >> index fc93e9e6e8da..df0dbffa7ac4 100644 >> --- a/hw/9pfs/virtio-9p-local.c >> +++ b/hw/9pfs/virtio-9p-local.c >> @@ -1068,8 +1068,8 @@ err_out: >> static int local_ioc_getversion(FsContext *ctx, V9fsPath *path, >> mode_t st_mode, uint64_t *st_gen) >> { >> - int err; >> #ifdef FS_IOC_GETVERSION >> + int err; >> V9fsFidOpenState fid_open; >> >> /* >> @@ -1077,7 +1077,8 @@ static int local_ioc_getversion(FsContext *ctx, V9fsPath *path, >> * We can get fd for regular files and directories only >> */ >> if (!S_ISREG(st_mode) && !S_ISDIR(st_mode)) { >> - return 0; >> + errno = ENOTTY; >> + return -1; >> } >> err = local_open(ctx, path, O_RDONLY, &fid_open); >> if (err < 0) { >> @@ -1085,10 +1086,11 @@ static int local_ioc_getversion(FsContext *ctx, V9fsPath *path, >> } >> err = ioctl(fid_open.fd, FS_IOC_GETVERSION, st_gen); >> local_close(ctx, &fid_open); >> + return err; >> #else >> - err = -ENOTTY; >> + errno = ENOTTY; >> + return -1; >> #endif >> - return err; >> } >> >> static int local_init(FsContext *ctx) >> diff --git a/hw/9pfs/virtio-9p-proxy.c b/hw/9pfs/virtio-9p-proxy.c >> index 5f44bb758b35..b57966d9d883 100644 >> --- a/hw/9pfs/virtio-9p-proxy.c >> +++ b/hw/9pfs/virtio-9p-proxy.c >> @@ -1086,7 +1086,8 @@ static int proxy_ioc_getversion(FsContext *fs_ctx, V9fsPath *path, >> * we can get fd for regular files and directories only >> */ >> if (!S_ISREG(st_mode) && !S_ISDIR(st_mode)) { >> - return 0; >> + errno = ENOTTY; >> + return -1; >> } >> err = v9fs_request(fs_ctx->private, T_GETVERSION, st_gen, "s", path); >> if (err < 0) { >> diff --git a/hw/9pfs/virtio-9p.c b/hw/9pfs/virtio-9p.c >> index 8cbb8ae32a03..3e51fcd152f8 100644 >> --- a/hw/9pfs/virtio-9p.c >> +++ b/hw/9pfs/virtio-9p.c >> @@ -1080,10 +1080,18 @@ static void v9fs_getattr(void *opaque) >> /* fill st_gen if requested and supported by underlying fs */ >> if (request_mask & P9_STATS_GEN) { >> retval = v9fs_co_st_gen(pdu, &fidp->path, stbuf.st_mode, &v9stat_dotl); >> - if (retval < 0) { >> + switch (retval) { >> + case 0: >> + /* we have valid st_gen: update result mask */ >> + v9stat_dotl.st_result_mask |= P9_STATS_GEN; >> + break; >> + case -EINTR: >> + /* request cancelled */ >> goto out; >> + default: >> + /* failed to get st_gen: not fatal, ignore */ >> + break; >> } >> - v9stat_dotl.st_result_mask |= P9_STATS_GEN; >> } >> retval = pdu_marshal(pdu, offset, "A", &v9stat_dotl); >> if (retval < 0) { >> > > Michael, are you going to take this patch given that the virtio-9p > maintainer is AWOL? I did review the patch, and also specifically asked if we need a pull request with this just one patch or can it be taken directly to upstream tree. I was not sure whether generating a pull request with just one patch was useful. -aneesh