diff options
| author | Marc-André Lureau | 2022-05-25 16:41:31 +0200 |
|---|---|---|
| committer | Marc-André Lureau | 2022-05-28 11:42:56 +0200 |
| commit | 1a89a17b769352dbced5c6d8b0935e4d1f306c6e (patch) | |
| tree | 6dea622ec257c65a303570c8b0ede5217bb95a0e /qga | |
| parent | qga: add qga_open_cloexec() helper (diff) | |
| download | qemu-1a89a17b769352dbced5c6d8b0935e4d1f306c6e.tar.gz qemu-1a89a17b769352dbced5c6d8b0935e4d1f306c6e.tar.xz qemu-1a89a17b769352dbced5c6d8b0935e4d1f306c6e.zip | |
qga: use qga_open_cloexec() for safe_open_or_create()
The function takes care of setting CLOEXEC.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20220525144140.591926-7-marcandre.lureau@redhat.com>
Diffstat (limited to 'qga')
| -rw-r--r-- | qga/commands-posix.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/qga/commands-posix.c b/qga/commands-posix.c index 3b2392398e..2ecc43eca9 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -27,6 +27,7 @@ #include "qemu/cutils.h" #include "commands-common.h" #include "block/nvme.h" +#include "cutils.h" #ifdef HAVE_UTMPX #include <utmpx.h> @@ -370,10 +371,10 @@ safe_open_or_create(const char *path, const char *mode, Error **errp) * open() is decisive and its third argument is ignored, and the second * open() and the fchmod() are never called. */ - fd = open(path, oflag | ((oflag & O_CREAT) ? O_EXCL : 0), 0); + fd = qga_open_cloexec(path, oflag | ((oflag & O_CREAT) ? O_EXCL : 0), 0); if (fd == -1 && errno == EEXIST) { oflag &= ~(unsigned)O_CREAT; - fd = open(path, oflag); + fd = qga_open_cloexec(path, oflag, 0); } if (fd == -1) { error_setg_errno(errp, errno, @@ -382,8 +383,6 @@ safe_open_or_create(const char *path, const char *mode, Error **errp) goto end; } - qemu_set_cloexec(fd); - if ((oflag & O_CREAT) && fchmod(fd, DEFAULT_NEW_FILE_MODE) == -1) { error_setg_errno(errp, errno, "failed to set permission " "0%03o on new file '%s' (mode: '%s')", |