ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

9pfs: local: remove: don't follow symlinks 

The local_remove() callback is vulnerable to symlink attacks because it
calls:

(1) lstat() which follows symbolic links in all path elements but the
    rightmost one
(2) remove() which follows symbolic links in all path elements but the
    rightmost one

This patch converts local_remove() to rely on opendir_nofollow(),
fstatat(AT_SYMLINK_NOFOLLOW) to fix (1) and unlinkat() to fix (2).

This partly fixes CVE-2016-9602.

Signed-off-by: Greg Kurz <groug@kaod.org>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Greg Kurz 2017-02-26 23:43:08 +01:00
parent df4938a665
commit a0e640a872
1 changed files with 21 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
hw/9pfs/9p-local.c
View File

@ -1021,54 +1021,32 @@ err_out:
static int local_remove(FsContext *ctx, const char *path) static int local_remove(FsContext *ctx, const char *path)
{ {
int err;
struct stat stbuf; struct stat stbuf;
char *buffer; char *dirpath = g_path_get_dirname(path);
char *name = g_path_get_basename(path);
int flags = 0;
int dirfd;
int err = -1;
if (ctx->export_flags & V9FS_SM_MAPPED_FILE) { dirfd = local_opendir_nofollow(ctx, dirpath);
buffer = rpath(ctx, path); if (dirfd) {
err = lstat(buffer, &stbuf); goto out;
g_free(buffer); }
if (err) {
if (fstatat(dirfd, path, &stbuf, AT_SYMLINK_NOFOLLOW) < 0) {
goto err_out; goto err_out;
} }
/*
* If directory remove .virtfs_metadata contained in the
* directory
*/
if (S_ISDIR(stbuf.st_mode)) { if (S_ISDIR(stbuf.st_mode)) {
buffer = g_strdup_printf("%s/%s/%s", ctx->fs_root, flags |= AT_REMOVEDIR;
path, VIRTFS_META_DIR);
err = remove(buffer);
g_free(buffer);
if (err < 0 && errno != ENOENT) {
/*
* We didn't had the .virtfs_metadata file. May be file created
* in non-mapped mode ?. Ignore ENOENT.
*/
goto err_out;
}
}
/*
* Now remove the name from parent directory
* .virtfs_metadata directory
*/
buffer = local_mapped_attr_path(ctx, path);
err = remove(buffer);
g_free(buffer);
if (err < 0 && errno != ENOENT) {
/*
* We didn't had the .virtfs_metadata file. May be file created
* in non-mapped mode ?. Ignore ENOENT.
*/
goto err_out;
}
} }
buffer = rpath(ctx, path); err = local_unlinkat_common(ctx, dirfd, name, flags);
err = remove(buffer);
g_free(buffer);
err_out: err_out:
close_preserve_errno(dirfd);
out:
g_free(name);
g_free(dirpath);
return err; return err;
} }