From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=59139 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OTMFA-00058r-4n for qemu-devel@nongnu.org; Mon, 28 Jun 2010 17:52:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OTMF6-0006rB-DC for qemu-devel@nongnu.org; Mon, 28 Jun 2010 17:51:55 -0400 Received: from e36.co.us.ibm.com ([32.97.110.154]:45953) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OTMF6-0006qr-7W for qemu-devel@nongnu.org; Mon, 28 Jun 2010 17:51:52 -0400 Received: from d03relay04.boulder.ibm.com (d03relay04.boulder.ibm.com [9.17.195.106]) by e36.co.us.ibm.com (8.14.4/8.13.1) with ESMTP id o5SLmQlo028205 for ; Mon, 28 Jun 2010 15:48:26 -0600 Received: from d03av02.boulder.ibm.com (d03av02.boulder.ibm.com [9.17.195.168]) by d03relay04.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o5SLplPw072114 for ; Mon, 28 Jun 2010 15:51:48 -0600 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 o5SLplOw027366 for ; Mon, 28 Jun 2010 15:51:47 -0600 From: "Venkateswararao Jujjuri (JV)" Date: Mon, 28 Jun 2010 14:55:17 -0700 Message-Id: <1277762117-11212-20-git-send-email-jvrao@linux.vnet.ibm.com> In-Reply-To: <1277762117-11212-1-git-send-email-jvrao@linux.vnet.ibm.com> References: <1277762117-11212-1-git-send-email-jvrao@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 20/20] virtio-9p: Hide user.virtfs xattr in case of mapped security. List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, Venkateswararao Jujjuri , "Aneesh Kumar K.V" From: Aneesh Kumar K.V With mapped security mode we use "user.virtfs" namespace is used to store the virtFs related attributes. So hide it from user. Signed-off-by: Aneesh Kumar K.V Signed-off-by: Venkateswararao Jujjuri --- hw/virtio-9p-local.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 72 insertions(+), 3 deletions(-) diff --git a/hw/virtio-9p-local.c b/hw/virtio-9p-local.c index 3944cf3..87ff953 100644 --- a/hw/virtio-9p-local.c +++ b/hw/virtio-9p-local.c @@ -480,18 +480,87 @@ static int local_statfs(FsContext *s, const char *path, struct statfs *stbuf) static ssize_t local_lgetxattr(FsContext *ctx, const char *path, const char *name, void *value, size_t size) { + if ((ctx->fs_sm == SM_MAPPED) && + (strncmp(name, "user.virtfs.", 12) == 0)) { + /* + * Don't allow fetch of user.virtfs namesapce + * in case of mapped security + */ + errno = ENOATTR; + return -1; + } + return lgetxattr(rpath(ctx, path), name, value, size); } static ssize_t local_llistxattr(FsContext *ctx, const char *path, void *value, size_t size) { - return llistxattr(rpath(ctx, path), value, size); + ssize_t retval; + ssize_t actual_len = 0; + char *orig_value, *orig_value_start; + char *temp_value, *temp_value_start; + ssize_t xattr_len, parsed_len = 0, attr_len; + + if (ctx->fs_sm != SM_MAPPED) { + return llistxattr(rpath(ctx, path), value, size); + } + + /* Get the actual len */ + xattr_len = llistxattr(rpath(ctx, path), value, 0); + + /* Now fetch the xattr and find the actual size */ + orig_value = qemu_malloc(xattr_len); + xattr_len = llistxattr(rpath(ctx, path), orig_value, xattr_len); + + /* + * For mapped security model drop user.virtfs namespace + * from the list + */ + temp_value = qemu_mallocz(xattr_len); + temp_value_start = temp_value; + orig_value_start = orig_value; + while (xattr_len > parsed_len) { + attr_len = strlen(orig_value) + 1; + if (strncmp(orig_value, "user.virtfs.", 12) != 0) { + /* Copy this entry */ + strcat(temp_value, orig_value); + temp_value += attr_len; + actual_len += attr_len; + } + parsed_len += attr_len; + orig_value += attr_len; + } + if (!size) { + retval = actual_len; + goto out; + } else if (size >= actual_len) { + /* now copy the parsed attribute list back */ + memset(value, 0, size); + memcpy(value, temp_value_start, actual_len); + retval = actual_len; + goto out; + } + errno = ERANGE; + retval = -1; +out: + qemu_free(orig_value_start); + qemu_free(temp_value_start); + return retval; } static int local_lsetxattr(FsContext *ctx, const char *path, const char *name, - void *value, size_t size, int flags) -{ + void *value, size_t size, int flags) +{ + if ((ctx->fs_sm == SM_MAPPED) && + (strncmp(name, "user.virtfs.", 12) == 0)) { + /* + * Don't allow fetch of user.virtfs namesapce + * in case of mapped security + */ + errno = EACCES; + return -1; + } return lsetxattr(rpath(ctx, path), name, value, size, flags); } -- 1.6.5.2