[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 06/11] 9pfs: assume utimensat() and futimens() are
From: |
Greg Kurz |
Subject: |
[Qemu-devel] [PULL v2 06/11] 9pfs: assume utimensat() and futimens() are present |
Date: |
Tue, 30 May 2017 15:40:35 +0200 |
The utimensat() and futimens() syscalls have been around for ages (ie,
glibc 2.6 and linux 2.6.22), and the decision was already taken to
switch to utimensat() anyway when fixing CVE-2016-9602 in 2.9.
Signed-off-by: Greg Kurz <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
fsdev/virtfs-proxy-helper.c | 3 ++-
hw/9pfs/9p-handle.c | 5 -----
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/fsdev/virtfs-proxy-helper.c b/fsdev/virtfs-proxy-helper.c
index 4c4238f62e53..6c066ec9a0ce 100644
--- a/fsdev/virtfs-proxy-helper.c
+++ b/fsdev/virtfs-proxy-helper.c
@@ -945,7 +945,8 @@ static int process_requests(int sock)
&spec[0].tv_sec, &spec[0].tv_nsec,
&spec[1].tv_sec, &spec[1].tv_nsec);
if (retval > 0) {
- retval = qemu_utimens(path.data, spec);
+ retval = utimensat(AT_FDCWD, path.data, spec,
+ AT_SYMLINK_NOFOLLOW);
if (retval < 0) {
retval = -errno;
}
diff --git a/hw/9pfs/9p-handle.c b/hw/9pfs/9p-handle.c
index 1687661bc95a..9875f1894cc5 100644
--- a/hw/9pfs/9p-handle.c
+++ b/hw/9pfs/9p-handle.c
@@ -378,7 +378,6 @@ static int handle_utimensat(FsContext *ctx, V9fsPath
*fs_path,
const struct timespec *buf)
{
int ret;
-#ifdef CONFIG_UTIMENSAT
int fd;
struct handle_data *data = (struct handle_data *)ctx->private;
@@ -388,10 +387,6 @@ static int handle_utimensat(FsContext *ctx, V9fsPath
*fs_path,
}
ret = futimens(fd, buf);
close(fd);
-#else
- ret = -1;
- errno = ENOSYS;
-#endif
return ret;
}
--
2.7.5
- [Qemu-devel] [PULL v2 00/11] 9pfs patches for 2.10 20170530, Greg Kurz, 2017/05/30
- [Qemu-devel] [PULL v2 01/11] virtio-9p/xen-9p: move 9p specific bits to core 9p code, Greg Kurz, 2017/05/30
- [Qemu-devel] [PULL v2 05/11] fsdev: fix virtfs-proxy-helper cwd, Greg Kurz, 2017/05/30
- [Qemu-devel] [PULL v2 02/11] fsdev: don't allow unknown format in marshal/unmarshal, Greg Kurz, 2017/05/30
- [Qemu-devel] [PULL v2 04/11] 9pfs: local: fix unlink of alien files in mapped-file mode, Greg Kurz, 2017/05/30
- [Qemu-devel] [PULL v2 07/11] util: drop old utimensat() compat code, Greg Kurz, 2017/05/30
- [Qemu-devel] [PULL v2 03/11] 9pfs: drop pdu_push_and_notify(), Greg Kurz, 2017/05/30
- [Qemu-devel] [PULL v2 06/11] 9pfs: assume utimensat() and futimens() are present,
Greg Kurz <=
- [Qemu-devel] [PULL v2 11/11] 9pfs: local: metadata file for the VirtFS root, Greg Kurz, 2017/05/30
- [Qemu-devel] [PULL v2 10/11] 9pfs: local: simplify file opening, Greg Kurz, 2017/05/30
- [Qemu-devel] [PULL v2 09/11] 9pfs: local: resolve special directories in paths, Greg Kurz, 2017/05/30
- [Qemu-devel] [PULL v2 08/11] 9pfs: check return value of v9fs_co_name_to_path(), Greg Kurz, 2017/05/30