[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 19/31] 9pfs: local: readlink: don't follow symlinks
From: |
Greg Kurz |
Subject: |
[Qemu-devel] [PULL 19/31] 9pfs: local: readlink: don't follow symlinks |
Date: |
Tue, 28 Feb 2017 00:00:09 +0100 |
The local_readlink() callback is vulnerable to symlink attacks because it
calls:
(1) open(O_NOFOLLOW) which follows symbolic links for all path elements but
the rightmost one
(2) readlink() which follows symbolic links for all path elements but the
rightmost one
This patch converts local_readlink() to rely on open_nofollow() to fix (1)
and opendir_nofollow(), readlinkat() to fix (2).
This partly fixes CVE-2016-9602.
Signed-off-by: Greg Kurz <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
---
hw/9pfs/9p-local.c | 26 +++++++++++++++++---------
1 file changed, 17 insertions(+), 9 deletions(-)
diff --git a/hw/9pfs/9p-local.c b/hw/9pfs/9p-local.c
index c6c114839287..add1b2e83dbe 100644
--- a/hw/9pfs/9p-local.c
+++ b/hw/9pfs/9p-local.c
@@ -340,27 +340,35 @@ static ssize_t local_readlink(FsContext *fs_ctx, V9fsPath
*fs_path,
char *buf, size_t bufsz)
{
ssize_t tsize = -1;
- char *buffer;
- char *path = fs_path->data;
if ((fs_ctx->export_flags & V9FS_SM_MAPPED) ||
(fs_ctx->export_flags & V9FS_SM_MAPPED_FILE)) {
int fd;
- buffer = rpath(fs_ctx, path);
- fd = open(buffer, O_RDONLY | O_NOFOLLOW);
- g_free(buffer);
+
+ fd = local_open_nofollow(fs_ctx, fs_path->data, O_RDONLY, 0);
if (fd == -1) {
return -1;
}
do {
tsize = read(fd, (void *)buf, bufsz);
} while (tsize == -1 && errno == EINTR);
- close(fd);
+ close_preserve_errno(fd);
} else if ((fs_ctx->export_flags & V9FS_SM_PASSTHROUGH) ||
(fs_ctx->export_flags & V9FS_SM_NONE)) {
- buffer = rpath(fs_ctx, path);
- tsize = readlink(buffer, buf, bufsz);
- g_free(buffer);
+ char *dirpath = g_path_get_dirname(fs_path->data);
+ char *name = g_path_get_basename(fs_path->data);
+ int dirfd;
+
+ dirfd = local_opendir_nofollow(fs_ctx, dirpath);
+ if (dirfd == -1) {
+ goto out;
+ }
+
+ tsize = readlinkat(dirfd, name, buf, bufsz);
+ close_preserve_errno(dirfd);
+ out:
+ g_free(name);
+ g_free(dirpath);
}
return tsize;
}
--
2.7.4
- [Qemu-devel] [PULL 01/31] 9pfs: fix v9fs_lock error case, (continued)
- [Qemu-devel] [PULL 01/31] 9pfs: fix v9fs_lock error case, Greg Kurz, 2017/02/27
- [Qemu-devel] [PULL 02/31] fsdev: add IO throttle support to fsdev devices, Greg Kurz, 2017/02/27
- [Qemu-devel] [PULL 12/31] 9pfs: local: lsetxattr: don't follow symlinks, Greg Kurz, 2017/02/27
- [Qemu-devel] [PULL 15/31] 9pfs: local: remove: don't follow symlinks, Greg Kurz, 2017/02/27
- [Qemu-devel] [PULL 03/31] throttle: factor out duplicate code, Greg Kurz, 2017/02/27
- [Qemu-devel] [PULL 21/31] 9pfs: local: renameat: don't follow symlinks, Greg Kurz, 2017/02/27
- [Qemu-devel] [PULL 16/31] 9pfs: local: utimensat: don't follow symlinks, Greg Kurz, 2017/02/27
- [Qemu-devel] [PULL 04/31] 9pfs: local: move xattr security ops to 9p-xattr.c, Greg Kurz, 2017/02/27
- [Qemu-devel] [PULL 14/31] 9pfs: local: unlinkat: don't follow symlinks, Greg Kurz, 2017/02/27
- [Qemu-devel] [PULL 17/31] 9pfs: local: statfs: don't follow symlinks, Greg Kurz, 2017/02/27
- [Qemu-devel] [PULL 19/31] 9pfs: local: readlink: don't follow symlinks,
Greg Kurz <=
- [Qemu-devel] [PULL 20/31] 9pfs: local: lstat: don't follow symlinks, Greg Kurz, 2017/02/27
- [Qemu-devel] [PULL 23/31] 9pfs: local: improve error handling in link op, Greg Kurz, 2017/02/27
- [Qemu-devel] [PULL 26/31] 9pfs: local: chown: don't follow symlinks, Greg Kurz, 2017/02/27
- [Qemu-devel] [PULL 18/31] 9pfs: local: truncate: don't follow symlinks, Greg Kurz, 2017/02/27
- [Qemu-devel] [PULL 22/31] 9pfs: local: rename: use renameat, Greg Kurz, 2017/02/27
- [Qemu-devel] [PULL 09/31] 9pfs: local: open/opendir: don't follow symlinks, Greg Kurz, 2017/02/27
- [Qemu-devel] [PULL 30/31] 9pfs: local: open2: don't follow symlinks, Greg Kurz, 2017/02/27
- [Qemu-devel] [PULL 29/31] 9pfs: local: mkdir: don't follow symlinks, Greg Kurz, 2017/02/27
- [Qemu-devel] [PULL 31/31] 9pfs: local: drop unused code, Greg Kurz, 2017/02/27
- [Qemu-devel] [PULL 28/31] 9pfs: local: mknod: don't follow symlinks, Greg Kurz, 2017/02/27