[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 06/15] qga: use qga_open_cloexec() for safe_open_or_create()
From: |
marcandre . lureau |
Subject: |
[PULL v2 06/15] qga: use qga_open_cloexec() for safe_open_or_create() |
Date: |
Mon, 30 May 2022 00:51:28 +0200 |
From: Marc-André Lureau <marcandre.lureau@redhat.com>
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>
---
qga/commands-posix.c | 7 +++----
1 file 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')",
--
2.36.1
- [PULL v2 00/15] Misc patches, marcandre . lureau, 2022/05/29
- [PULL v2 01/15] include: move qemu_*_exec_dir() to cutils, marcandre . lureau, 2022/05/29
- [PULL v2 03/15] tests: make libqmp buildable for win32, marcandre . lureau, 2022/05/29
- [PULL v2 02/15] util/win32: simplify qemu_get_local_state_dir(), marcandre . lureau, 2022/05/29
- [PULL v2 05/15] qga: add qga_open_cloexec() helper, marcandre . lureau, 2022/05/29
- [PULL v2 06/15] qga: use qga_open_cloexec() for safe_open_or_create(),
marcandre . lureau <=
- [PULL v2 07/15] qga: throw an Error in ga_channel_open(), marcandre . lureau, 2022/05/29
- [PULL v2 08/15] qga: replace qemu_open_old() with qga_open_cloexec(), marcandre . lureau, 2022/05/29
- [PULL v2 11/15] qga/wixl: prefer variables over environment, marcandre . lureau, 2022/05/29
- [PULL v2 04/15] qga: flatten safe_open_or_create(), marcandre . lureau, 2022/05/29
- [PULL v2 09/15] qga: make build_fs_mount_list() return a bool, marcandre . lureau, 2022/05/29
- [PULL v2 12/15] qga/wixl: require Mingw_bin, marcandre . lureau, 2022/05/29
- [PULL v2 10/15] test/qga: use G_TEST_DIR to locate os-release test file, marcandre . lureau, 2022/05/29
- [PULL v2 13/15] qga/wixl: simplify some pre-processing, marcandre . lureau, 2022/05/29
- [PULL v2 14/15] qga/wixl: replace QEMU_GA_MSI_MINGW_BIN_PATH with glib bindir, marcandre . lureau, 2022/05/29
- [PULL v2 15/15] test/qga: use g_auto wherever sensible, marcandre . lureau, 2022/05/29