qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Greg Kurz <groug@kaod.org>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
	"Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>,
	Greg Kurz <groug@kaod.org>
Subject: [Qemu-devel] [PULL 18/31] 9pfs: local: truncate: don't follow symlinks
Date: Tue, 28 Feb 2017 00:00:08 +0100	[thread overview]
Message-ID: <1488236421-30983-19-git-send-email-groug@kaod.org> (raw)
In-Reply-To: <1488236421-30983-1-git-send-email-groug@kaod.org>

The local_truncate() callback is vulnerable to symlink attacks because
it calls truncate() which follows symbolic links in all path elements.

This patch converts local_truncate() to rely on open_nofollow() and
ftruncate() instead.

This partly fixes CVE-2016-9602.

Signed-off-by: Greg Kurz <groug@kaod.org>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 hw/9pfs/9p-local.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/hw/9pfs/9p-local.c b/hw/9pfs/9p-local.c
index ae5d26821791..c6c114839287 100644
--- a/hw/9pfs/9p-local.c
+++ b/hw/9pfs/9p-local.c
@@ -894,13 +894,14 @@ err_out:
 
 static int local_truncate(FsContext *ctx, V9fsPath *fs_path, off_t size)
 {
-    char *buffer;
-    int ret;
-    char *path = fs_path->data;
+    int fd, ret;
 
-    buffer = rpath(ctx, path);
-    ret = truncate(buffer, size);
-    g_free(buffer);
+    fd = local_open_nofollow(ctx, fs_path->data, O_WRONLY, 0);
+    if (fd == -1) {
+        return -1;
+    }
+    ret = ftruncate(fd, size);
+    close_preserve_errno(fd);
     return ret;
 }
 
-- 
2.7.4

  parent reply	other threads:[~2017-02-27 23:00 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-02-27 22:59 [Qemu-devel] [PULL 00/31] 9p patches 2017-02-27 for 2.9 soft freeze Greg Kurz
2017-02-27 22:59 ` [Qemu-devel] [PULL 01/31] 9pfs: fix v9fs_lock error case Greg Kurz
2017-02-27 22:59 ` [Qemu-devel] [PULL 02/31] fsdev: add IO throttle support to fsdev devices Greg Kurz
2017-02-27 22:59 ` [Qemu-devel] [PULL 03/31] throttle: factor out duplicate code Greg Kurz
2017-02-27 22:59 ` [Qemu-devel] [PULL 04/31] 9pfs: local: move xattr security ops to 9p-xattr.c Greg Kurz
2017-02-27 22:59 ` [Qemu-devel] [PULL 05/31] 9pfs: remove side-effects in local_init() Greg Kurz
2017-02-27 22:59 ` [Qemu-devel] [PULL 06/31] 9pfs: remove side-effects in local_open() and local_opendir() Greg Kurz
2017-02-27 22:59 ` [Qemu-devel] [PULL 07/31] 9pfs: introduce relative_openat_nofollow() helper Greg Kurz
2017-02-27 23:37   ` Eric Blake
2017-02-28  0:33     ` Greg Kurz
2017-02-27 22:59 ` [Qemu-devel] [PULL 08/31] 9pfs: local: keep a file descriptor on the shared folder Greg Kurz
2017-02-27 22:59 ` [Qemu-devel] [PULL 09/31] 9pfs: local: open/opendir: don't follow symlinks Greg Kurz
2017-02-27 23:00 ` [Qemu-devel] [PULL 10/31] 9pfs: local: lgetxattr: " Greg Kurz
2017-02-27 23:00 ` [Qemu-devel] [PULL 11/31] 9pfs: local: llistxattr: " Greg Kurz
2017-02-27 23:00 ` [Qemu-devel] [PULL 12/31] 9pfs: local: lsetxattr: " Greg Kurz
2017-02-27 23:00 ` [Qemu-devel] [PULL 13/31] 9pfs: local: lremovexattr: " Greg Kurz
2017-02-27 23:00 ` [Qemu-devel] [PULL 14/31] 9pfs: local: unlinkat: " Greg Kurz
2017-02-27 23:00 ` [Qemu-devel] [PULL 15/31] 9pfs: local: remove: " Greg Kurz
2017-02-27 23:00 ` [Qemu-devel] [PULL 16/31] 9pfs: local: utimensat: " Greg Kurz
2017-02-27 23:00 ` [Qemu-devel] [PULL 17/31] 9pfs: local: statfs: " Greg Kurz
2017-02-27 23:00 ` Greg Kurz [this message]
2017-02-27 23:00 ` [Qemu-devel] [PULL 19/31] 9pfs: local: readlink: " Greg Kurz
2017-02-27 23:00 ` [Qemu-devel] [PULL 20/31] 9pfs: local: lstat: " Greg Kurz
2017-02-27 23:00 ` [Qemu-devel] [PULL 21/31] 9pfs: local: renameat: " Greg Kurz
2017-02-27 23:00 ` [Qemu-devel] [PULL 22/31] 9pfs: local: rename: use renameat Greg Kurz
2017-02-27 23:00 ` [Qemu-devel] [PULL 23/31] 9pfs: local: improve error handling in link op Greg Kurz
2017-02-27 23:00 ` [Qemu-devel] [PULL 24/31] 9pfs: local: link: don't follow symlinks Greg Kurz
2017-02-27 23:00 ` [Qemu-devel] [PULL 25/31] 9pfs: local: chmod: " Greg Kurz
2017-02-27 23:00 ` [Qemu-devel] [PULL 26/31] 9pfs: local: chown: " Greg Kurz
2017-02-27 23:00 ` [Qemu-devel] [PULL 27/31] 9pfs: local: symlink: " Greg Kurz
2017-02-27 23:00 ` [Qemu-devel] [PULL 28/31] 9pfs: local: mknod: " Greg Kurz
2017-02-27 23:00 ` [Qemu-devel] [PULL 29/31] 9pfs: local: mkdir: " Greg Kurz
2017-02-27 23:00 ` [Qemu-devel] [PULL 30/31] 9pfs: local: open2: " Greg Kurz
2017-02-27 23:00 ` [Qemu-devel] [PULL 31/31] 9pfs: local: drop unused code Greg Kurz
2017-02-27 23:41 ` [Qemu-devel] [PULL 00/31] 9p patches 2017-02-27 for 2.9 soft freeze no-reply
2017-02-28  0:00 ` no-reply
2017-02-28  0:36   ` Greg Kurz
2017-02-28  0:37 ` Greg Kurz
2017-02-28  5:58   ` Michael Tokarev
2017-02-28  7:31     ` Greg Kurz

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1488236421-30983-19-git-send-email-groug@kaod.org \
    --to=groug@kaod.org \
    --cc=aneesh.kumar@linux.vnet.ibm.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).