diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2015-11-04 14:48:47 +0100 |
|---|---|---|
| committer | Michael Tokarev <mjt@tls.msk.ru> | 2015-11-06 15:42:38 +0300 |
| commit | a2f31f180499593b5edb8ac5ab8ac1b92f0abcd4 (patch) | |
| tree | 176fdc1f2a9b6726ecffd8d6c22753914e8aa51d | |
| parent | 3ede8f699645f4ca7cdbc40d8139e5a0275b4805 (diff) | |
| download | focaccia-qemu-a2f31f180499593b5edb8ac5ab8ac1b92f0abcd4.tar.gz focaccia-qemu-a2f31f180499593b5edb8ac5ab8ac1b92f0abcd4.zip | |
qemu-sockets: do not test path with access() before unlinking
Using access() is a time-of-check/time-of-use race condition. It is okay to use them to provide better error messages, but that is pretty much it. This is not one such case; on the other hand, access() *will* skip unlink() for a non-existent path, so ignore ENOENT return values from the unlink() system call. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com> Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
| -rw-r--r-- | util/qemu-sockets.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c index dfe45875f8..5a31d164d9 100644 --- a/util/qemu-sockets.c +++ b/util/qemu-sockets.c @@ -751,8 +751,7 @@ int unix_listen_opts(QemuOpts *opts, Error **errp) qemu_opt_set(opts, "path", un.sun_path, &error_abort); } - if ((access(un.sun_path, F_OK) == 0) && - unlink(un.sun_path) < 0) { + if (unlink(un.sun_path) < 0 && errno != ENOENT) { error_setg_errno(errp, errno, "Failed to unlink socket %s", un.sun_path); goto err; |