From patchwork Tue Jun 1 09:28:49 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Aneesh Kumar K.V" X-Patchwork-Id: 54162 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 8BB90B7D57 for ; Tue, 1 Jun 2010 19:39:36 +1000 (EST) Received: from localhost ([127.0.0.1]:59561 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OJNuU-00016w-6y for incoming@patchwork.ozlabs.org; Tue, 01 Jun 2010 05:37:22 -0400 Received: from [140.186.70.92] (port=37111 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OJNmT-00064H-3j for qemu-devel@nongnu.org; Tue, 01 Jun 2010 05:29:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OJNmQ-0005Jx-08 for qemu-devel@nongnu.org; Tue, 01 Jun 2010 05:29:04 -0400 Received: from e28smtp06.in.ibm.com ([122.248.162.6]:37802) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OJNmP-0005Is-6U for qemu-devel@nongnu.org; Tue, 01 Jun 2010 05:29:01 -0400 Received: from d28relay03.in.ibm.com (d28relay03.in.ibm.com [9.184.220.60]) by e28smtp06.in.ibm.com (8.14.4/8.13.1) with ESMTP id o519Su2k025716 for ; Tue, 1 Jun 2010 14:58:56 +0530 Received: from d28av05.in.ibm.com (d28av05.in.ibm.com [9.184.220.67]) by d28relay03.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o519Str42253016 for ; Tue, 1 Jun 2010 14:58:55 +0530 Received: from d28av05.in.ibm.com (loopback [127.0.0.1]) by d28av05.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id o519Sst1028865 for ; Tue, 1 Jun 2010 19:28:55 +1000 Received: from skywalker.in.ibm.com (K50wks273996wss.in.ibm.com [9.124.35.158]) by d28av05.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id o519SsSQ028832; Tue, 1 Jun 2010 19:28:54 +1000 From: "Aneesh Kumar K.V" To: qemu-devel@nongnu.org Date: Tue, 1 Jun 2010 14:58:49 +0530 Message-Id: <1275384529-28757-4-git-send-email-aneesh.kumar@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1.236.g81fa0 In-Reply-To: <1275384529-28757-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> References: <1275384529-28757-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) Cc: ericvh@gmail.com, v9fs-developer@lists.sourceforge.net, aliguori@us.ibm.com, "Aneesh Kumar K.V" Subject: [Qemu-devel] [PATCH 4/4] virtio-9p: Hide user.virtfs xattr in case of mapped security. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 --- hw/virtio-9p-local.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 71 insertions(+), 2 deletions(-) diff --git a/hw/virtio-9p-local.c b/hw/virtio-9p-local.c index 4799fa9..a52e9e8 100644 --- a/hw/virtio-9p-local.c +++ b/hw/virtio-9p-local.c @@ -475,18 +475,87 @@ static int local_statfs(FsContext *s, const char *path, struct statfs *stbuf) static int 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 int local_llistxattr(FsContext *ctx, const char *path, +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) { + 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); }