From patchwork Sat Jun 5 01:08:47 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: jvrao X-Patchwork-Id: 104363 Received: from lists.sourceforge.net (lists.sourceforge.net [216.34.181.88]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o5515YGO028323 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Sat, 5 Jun 2010 01:06:10 GMT Received: from localhost ([127.0.0.1] helo=sfs-ml-2.v29.ch3.sourceforge.com) by sfs-ml-2.v29.ch3.sourceforge.com with esmtp (Exim 4.69) (envelope-from ) id 1OKhpA-0003EF-MN; Sat, 05 Jun 2010 01:05:20 +0000 Received: from sfi-mx-1.v28.ch3.sourceforge.com ([172.29.28.121] helo=mx.sourceforge.net) by sfs-ml-2.v29.ch3.sourceforge.com with esmtp (Exim 4.69) (envelope-from ) id 1OKhp9-0003E7-RQ for v9fs-developer@lists.sourceforge.net; Sat, 05 Jun 2010 01:05:19 +0000 X-ACL-Warn: Received: from e35.co.us.ibm.com ([32.97.110.153]) by sfi-mx-1.v28.ch3.sourceforge.com with esmtps (TLSv1:AES256-SHA:256) (Exim 4.69) id 1OKhp8-0007dz-HR for v9fs-developer@lists.sourceforge.net; Sat, 05 Jun 2010 01:05:19 +0000 Received: from d03relay01.boulder.ibm.com (d03relay01.boulder.ibm.com [9.17.195.226]) by e35.co.us.ibm.com (8.14.4/8.13.1) with ESMTP id o550wQg2014665 for ; Fri, 4 Jun 2010 18:58:26 -0600 Received: from d03av02.boulder.ibm.com (d03av02.boulder.ibm.com [9.17.195.168]) by d03relay01.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o5515BS1136126 for ; Fri, 4 Jun 2010 19:05:11 -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 o5515ADd007832 for ; Fri, 4 Jun 2010 19:05:10 -0600 Received: from localhost.localdomain (elm9m80.beaverton.ibm.com [9.47.81.80]) by d03av02.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id o55156BD007599; Fri, 4 Jun 2010 19:05:10 -0600 From: "Venkateswararao Jujjuri (JV)" To: qemu-devel@nongnu.org Date: Fri, 4 Jun 2010 18:08:47 -0700 Message-Id: <1275700132-22823-6-git-send-email-jvrao@linux.vnet.ibm.com> X-Mailer: git-send-email 1.6.0.6 In-Reply-To: <1275700132-22823-1-git-send-email-jvrao@linux.vnet.ibm.com> References: <1275700132-22823-1-git-send-email-jvrao@linux.vnet.ibm.com> X-Spam-Score: -0.2 (/) X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -0.2 AWL AWL: From: address is in the auto white-list X-Headers-End: 1OKhp8-0007dz-HR Cc: v9fs-developer@lists.sourceforge.net, aliguori@us.ibm.com Subject: [V9fs-developer] [PATCH-V5 05/10] virtio-9p: Implemented Security model for lstat and fstat X-BeenThere: v9fs-developer@lists.sourceforge.net X-Mailman-Version: 2.1.9 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: v9fs-developer-bounces@lists.sourceforge.net X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Sat, 05 Jun 2010 01:06:11 +0000 (UTC) diff --git a/hw/virtio-9p-local.c b/hw/virtio-9p-local.c index 0a21591..b1d2764 100644 --- a/hw/virtio-9p-local.c +++ b/hw/virtio-9p-local.c @@ -27,9 +27,38 @@ static const char *rpath(FsContext *ctx, const char *path) return buffer; } -static int local_lstat(FsContext *ctx, const char *path, struct stat *stbuf) + +static int local_lstat(FsContext *fs_ctx, const char *path, struct stat *stbuf) { - return lstat(rpath(ctx, path), stbuf); + int err; + err = lstat(rpath(fs_ctx, path), stbuf); + if (err) { + return err; + } + if (fs_ctx->fs_sm == SM_MAPPED) { + /* Actual credentials are part of extended attrs */ + uid_t tmp_uid; + gid_t tmp_gid; + mode_t tmp_mode; + dev_t tmp_dev; + if (getxattr(rpath(fs_ctx, path), "user.virtfs.uid", &tmp_uid, + sizeof(uid_t)) > 0) { + stbuf->st_uid = tmp_uid; + } + if (getxattr(rpath(fs_ctx, path), "user.virtfs.gid", &tmp_gid, + sizeof(gid_t)) > 0) { + stbuf->st_gid = tmp_gid; + } + if (getxattr(rpath(fs_ctx, path), "user.virtfs.mode", &tmp_mode, + sizeof(mode_t)) > 0) { + stbuf->st_mode = tmp_mode; + } + if (getxattr(rpath(fs_ctx, path), "user.virtfs.rdev", &tmp_dev, + sizeof(dev_t)) > 0) { + stbuf->st_rdev = tmp_dev; + } + } + return err; } static int local_set_xattr(const char *path, FsCred *credp) @@ -171,9 +200,34 @@ static int local_mkdir(FsContext *ctx, const char *path, mode_t mode) return mkdir(rpath(ctx, path), mode); } -static int local_fstat(FsContext *ctx, int fd, struct stat *stbuf) +static int local_fstat(FsContext *fs_ctx, int fd, struct stat *stbuf) { - return fstat(fd, stbuf); + int err; + err = fstat(fd, stbuf); + if (err) { + return err; + } + if (fs_ctx->fs_sm == SM_MAPPED) { + /* Actual credentials are part of extended attrs */ + uid_t tmp_uid; + gid_t tmp_gid; + mode_t tmp_mode; + dev_t tmp_dev; + + if (fgetxattr(fd, "user.virtfs.uid", &tmp_uid, sizeof(uid_t)) > 0) { + stbuf->st_uid = tmp_uid; + } + if (fgetxattr(fd, "user.virtfs.gid", &tmp_gid, sizeof(gid_t)) > 0) { + stbuf->st_gid = tmp_gid; + } + if (fgetxattr(fd, "user.virtfs.mode", &tmp_mode, sizeof(mode_t)) > 0) { + stbuf->st_mode = tmp_mode; + } + if (fgetxattr(fd, "user.virtfs.rdev", &tmp_dev, sizeof(dev_t)) > 0) { + stbuf->st_rdev = tmp_dev; + } + } + return err; } static int local_open2(FsContext *ctx, const char *path, int flags, mode_t mode)