39 lines
1.6 KiB
Diff
39 lines
1.6 KiB
Diff
From 2aefb506e491e0ddf1abb6a7cbb2c4137e01e47e Mon Sep 17 00:00:00 2001
|
|
From: chenyuhui <chenyuhui5@huawei.com>
|
|
Date: Mon, 1 Aug 2022 19:32:29 +0800
|
|
Subject: [PATCH 21/22] virNetDevSaveNetConfig: Pass mode to virFileWriteStr()
|
|
|
|
For some types of SRIOV interfaces we create a temporary file
|
|
where the state of the interface is saved before we start
|
|
modifying it. The file is used then to restore the original
|
|
configuration when the interface is no longer associated with any
|
|
guest. For writing the file virFileWriteStr() is used. However,
|
|
it's given wrong argument: the last argument is supposed to be
|
|
mode to create the file with but virNetDevSaveNetConfig() passes
|
|
open(2) flags (O_CREAT|O_TRUNC|O_WRONLY). We need the file to be
|
|
writable and readable by root only (0600). Therefore, pass that
|
|
mode instead of gibberish.
|
|
|
|
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
|
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
|
|
---
|
|
src/util/virnetdev.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c
|
|
index 950844b110..518eaea820 100644
|
|
--- a/src/util/virnetdev.c
|
|
+++ b/src/util/virnetdev.c
|
|
@@ -1916,7 +1916,7 @@ virNetDevSaveNetConfig(const char *linkdev, int vf,
|
|
if (!(fileStr = virJSONValueToString(configJSON, true)))
|
|
goto cleanup;
|
|
|
|
- if (virFileWriteStr(filePath, fileStr, O_CREAT|O_TRUNC|O_WRONLY) < 0) {
|
|
+ if (virFileWriteStr(filePath, fileStr, 0600) < 0) { /* 0600: writable and readable by root */
|
|
virReportSystemError(errno, _("Unable to preserve mac/vlan tag "
|
|
"for device = %s, vf = %d"), linkdev, vf);
|
|
goto cleanup;
|
|
--
|
|
2.33.0
|
|
|