From: Aneesh Kumar K.V Date: Mon, 20 May 2013 11:58:29 +0000 (+0530) Subject: hw/9pfs: use O_NOFOLLOW for mapped readlink operation X-Git-Tag: qemu-xen-4.4.0-rc1~6^2~353^2~2 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=aed858ce10ef09c7bdf03f73e75e772f567c74cd;p=qemu-upstream-4.5-testing.git hw/9pfs: use O_NOFOLLOW for mapped readlink operation With mapped security models like mapped-xattr and mapped-file, we save the symlink target as file contents. Now if we ever expose a normal directory with mapped security model and find real symlinks in export path, never follow them and return proper error. Reviewed-by: Stefan Hajnoczi Signed-off-by: Aneesh Kumar K.V --- diff --git a/hw/9pfs/virtio-9p-local.c b/hw/9pfs/virtio-9p-local.c index 6ece6f7d1..87aa75d92 100644 --- a/hw/9pfs/virtio-9p-local.c +++ b/hw/9pfs/virtio-9p-local.c @@ -284,7 +284,7 @@ static ssize_t local_readlink(FsContext *fs_ctx, V9fsPath *fs_path, if ((fs_ctx->export_flags & V9FS_SM_MAPPED) || (fs_ctx->export_flags & V9FS_SM_MAPPED_FILE)) { int fd; - fd = open(rpath(fs_ctx, path, buffer), O_RDONLY); + fd = open(rpath(fs_ctx, path, buffer), O_RDONLY | O_NOFOLLOW); if (fd == -1) { return -1; }