- Devel - libvirt List Archives

[PATCH v1] qemu: block: fix error when blockcopy target is librbd encrypted
by Or Ozeri 12 Jan '23

12 Jan '23

Encryption secrets are considered a format dependency, even when being used by the storage node itself, as in the case of using encryption engine=librbd. Currently, the storage node is created (blockdev-add) before creating the format dependencies (including encryption secrets). As a result, when trying to perform a blockcopy when the target disk uses librbd encryption, an error of this form is returned: "error: internal error: unable to execute QEMU command 'blockdev-add': No secret with id 'libvirt-5-format-encryption-secret0'" To overcome this error, we change the order of commands so that format dependencies are created BEFORE creating the storage node. Signed-off-by: Or Ozeri <oro(a)il.ibm.com> --- src/qemu/qemu_block.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index e865aa17f9..2aafb2fac7 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -1490,9 +1490,9 @@ qemuBlockStorageSourceAttachApply(qemuMonitor *mon, qemuBlockStorageSourceAttachData *data) { if (qemuBlockStorageSourceAttachApplyStorageDeps(mon, data) < 0 || + qemuBlockStorageSourceAttachApplyFormatDeps(mon, data) < 0 || qemuBlockStorageSourceAttachApplyStorage(mon, data) < 0 || qemuBlockStorageSourceAttachApplyStorageSlice(mon, data) < 0 || - qemuBlockStorageSourceAttachApplyFormatDeps(mon, data) < 0 || qemuBlockStorageSourceAttachApplyFormat(mon, data) < 0) return -1; -- 2.25.1

1 0

[libvirt PATCH] ci: integration: Set an expiration on logs artifacts
by Erik Skultety 12 Jan '23

12 Jan '23

The default expiry time is 30 days. Since the RPM artifacts coming from the previous pipeline stages are set to expire in 1 day we can set the failed integration job log artifacts to the same value. The sentiment here is that if an integration job legitimately failed (i.e. not with an infrastructure failure) unless it was fixed in the meantime it will fail the next day with the scheduled pipeline again, meaning, that even if the older log artifacts are removed, they'll be immediately replaced with fresh ones. Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- If you look at: - https://gitlab.com/libvirt/libvirt/-/jobs/3563902921 - https://gitlab.com/libvirt/libvirt/-/jobs/3557946738 you can clearly see that the artifacts are still taking up (although small) some GitLab storage space which is unnecessary since anyone interested in debugging would opt into getting the latest ones anyway. ci/integration-template.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/integration-template.yml b/ci/integration-template.yml index 61cd034009..9141d5cedf 100644 --- a/ci/integration-template.yml +++ b/ci/integration-template.yml @@ -94,6 +94,7 @@ SCRATCH_DIR: "/tmp/scratch" artifacts: name: logs + expire_in: 1 day paths: - logs when: on_failure -- 2.39.0

2 1

[libvirt PATCH] NEWS: document external swtpm backend addition
by Ján Tomko 11 Jan '23

11 Jan '23

Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- NEWS.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index 768208ed03..8482c49b3c 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -33,6 +33,11 @@ v9.0.0 (unreleased) <backend type='passt'> ... + * QEMU: add external backend for swtpm + + Connecting the VM to a swtpm daemon started outside of libvirt + is now possible. + * **Improvements** * qemu: Prefer PNG for domain screenshots -- 2.39.0

2 1

[libvirt PATCH 0/2] Coverity inspired fixes for qemuPasstStart
by Jiri Denemark 11 Jan '23

11 Jan '23

Jiri Denemark (2): qemu: Don't check pidfile in qemuPasstStart qemu: Change some gotos in qemuPasstStart to direct return src/qemu/qemu_passt.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) -- 2.39.0

2 3

[libvirt PATCH] conf: Avoid NULL dereference in virDomainNetPortForwardFree
by Jiri Denemark 11 Jan '23

11 Jan '23

In our current code the function is not called with NULL argument, but we should follow our common practice and make it safe anyway. Reported by coverity: /src/conf/domain_conf.c: 2635 in virDomainNetPortForwardFree() 2629 { 2630 size_t i; 2631 2632 if (pf) 2633 g_free(pf->dev); 2634 >>> CID 404359: Null pointer dereferences (FORWARD_NULL) >>> Dereferencing null pointer "pf". 2635 for (i = 0; i < pf->nRanges; i++) 2636 g_free(pf->ranges[i]); 2637 2638 g_free(pf->ranges); 2639 g_free(pf); 2640 } Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/conf/domain_conf.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 598e23b005..e43dee1a60 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2629,8 +2629,10 @@ virDomainNetPortForwardFree(virDomainNetPortForward *pf) { size_t i; - if (pf) - g_free(pf->dev); + if (!pf) + return; + + g_free(pf->dev); for (i = 0; i < pf->nRanges; i++) g_free(pf->ranges[i]); -- 2.39.0

2 1

[PATCH v2] qemu: add append mode config for serial file
by Oleg Vasilev 11 Jan '23

11 Jan '23

Serial log file contains lots of useful information for debugging configuration problems. It makes sense to preserve the log in between restarts, so that one can later figure out what was going on. Before that, we could do that on a per-domain basis, now we can configure it once for all domains. Signed-off-by: Oleg Vasilev <oleg.vasilev(a)virtuozzo.com> --- src/qemu/libvirtd_qemu.aug | 3 ++ src/qemu/qemu.conf.in | 9 ++++ src/qemu/qemu_conf.c | 4 ++ src/qemu/qemu_conf.h | 2 + src/qemu/qemu_domain.c | 13 +++++ src/qemu/test_libvirtd_qemu.aug.in | 1 + tests/qemuxml2argvdata/serial-append.xml | 53 +++++++++++++++++++ .../qemuxml2xmloutdata/serial-append.off.xml | 53 +++++++++++++++++++ tests/qemuxml2xmloutdata/serial-append.on.xml | 53 +++++++++++++++++++ tests/qemuxml2xmloutdata/serial-append.xml | 53 +++++++++++++++++++ tests/qemuxml2xmltest.c | 10 ++++ 11 files changed, 254 insertions(+) create mode 100644 tests/qemuxml2argvdata/serial-append.xml create mode 100644 tests/qemuxml2xmloutdata/serial-append.off.xml create mode 100644 tests/qemuxml2xmloutdata/serial-append.on.xml create mode 100644 tests/qemuxml2xmloutdata/serial-append.xml diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug index ed097ea3d9..7f3eec7cfd 100644 --- a/src/qemu/libvirtd_qemu.aug +++ b/src/qemu/libvirtd_qemu.aug @@ -147,6 +147,8 @@ module Libvirtd_qemu = let capability_filters_entry = str_array_entry "capability_filters" + let serial_file_append_entry = str_entry "serial_file_append" + (* Each entry in the config is one of the following ... *) let entry = default_tls_entry | vnc_entry @@ -171,6 +173,7 @@ module Libvirtd_qemu = | swtpm_entry | capability_filters_entry | obsolete_entry + | serial_file_append_entry let comment = [ label "#comment" . del /#[ \t]*/ "# " . store /([^ \t\n][^\n]*)?/ . del /\n/ "\n" ] let empty = [ label "#empty" . eol ] diff --git a/src/qemu/qemu.conf.in b/src/qemu/qemu.conf.in index 3895d42514..9c9a535e8d 100644 --- a/src/qemu/qemu.conf.in +++ b/src/qemu/qemu.conf.in @@ -968,3 +968,12 @@ # "full" - both QEMU and its helper processes are placed into separate # scheduling group #sched_core = "none" + +# Default append mode for writing to serial file. QEMU will set the chosen +# value everytime it processes the config, unless some value is already there. +# +# Possible options are: +# "default" - leave as-is for QEMU to decide. +# "on" - set append value to "on", meaning file won't be truncated on restart +# "off" - set append value to "off", file will be cleared on restart +#serial_file_append = "default" diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index ae5bbcd138..bfd93a168f 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -288,6 +288,7 @@ virQEMUDriverConfig *virQEMUDriverConfigNew(bool privileged, return NULL; cfg->deprecationBehavior = g_strdup("none"); + cfg->serialFileAppend = g_strdup("default"); return g_steal_pointer(&cfg); } @@ -376,6 +377,7 @@ static void virQEMUDriverConfigDispose(void *obj) g_strfreev(cfg->capabilityfilters); g_free(cfg->deprecationBehavior); + g_free(cfg->serialFileAppend); } @@ -903,6 +905,8 @@ virQEMUDriverConfigLoadDebugEntry(virQEMUDriverConfig *cfg, return -1; if (virConfGetValueString(conf, "deprecation_behavior", &cfg->deprecationBehavior) < 0) return -1; + if (virConfGetValueString(conf, "serial_file_append", &cfg->serialFileAppend) < 0) + return -1; return 0; } diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index 8cf2dd2ec5..316200f38d 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -229,6 +229,8 @@ struct _virQEMUDriverConfig { char *deprecationBehavior; virQEMUSchedCore schedCore; + + char *serialFileAppend; }; G_DEFINE_AUTOPTR_CLEANUP_FUNC(virQEMUDriverConfig, virObjectUnref); diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 8ae458ae45..0d1fe1ffcc 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -37,6 +37,7 @@ #include "qemu_validate.h" #include "qemu_namespace.h" #include "viralloc.h" +#include "virenum.h" #include "virlog.h" #include "virerror.h" #include "viridentity.h" @@ -5357,6 +5358,8 @@ qemuDomainChrDefPostParse(virDomainChrDef *chr, virQEMUDriver *driver, unsigned int parseFlags) { + g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); + /* Historically, isa-serial and the default matched, so in order to * maintain backwards compatibility we map them here. The actual default * will be picked below based on the architecture and machine type. */ @@ -5428,6 +5431,16 @@ qemuDomainChrDefPostParse(virDomainChrDef *chr, } } + + if (chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL && + chr->source && + chr->source->type == VIR_DOMAIN_CHR_TYPE_FILE && + chr->source->data.file.append == VIR_TRISTATE_SWITCH_ABSENT) { + + chr->source->data.file.append = + virTristateSwitchTypeFromString(cfg->serialFileAppend); + } + return 0; } diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in index 1dbd692921..d1ca9c8d3d 100644 --- a/src/qemu/test_libvirtd_qemu.aug.in +++ b/src/qemu/test_libvirtd_qemu.aug.in @@ -117,3 +117,4 @@ module Test_libvirtd_qemu = } { "deprecation_behavior" = "none" } { "sched_core" = "none" } +{ "serial_file_append" = "default" } diff --git a/tests/qemuxml2argvdata/serial-append.xml b/tests/qemuxml2argvdata/serial-append.xml new file mode 100644 index 0000000000..662a711dd0 --- /dev/null +++ b/tests/qemuxml2argvdata/serial-append.xml @@ -0,0 +1,53 @@ +<domain type='qemu'> + <name>machine</name> + <uuid>2187c512-ff97-47d7-b67c-c02d3bdc219d</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <controller type='usb' index='0' model='piix3-uhci'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <serial type='file'> + <source path='/tmp/serial.file'> + <seclabel model='dac' relabel='no'/> + </source> + <target type='isa-serial' port='0'> + <model name='isa-serial'/> + </target> + </serial> + <serial type='unix'> + <source mode='connect' path='/tmp/serial.sock'> + <seclabel model='dac' relabel='no'/> + </source> + <target type='isa-serial' port='1'> + <model name='isa-serial'/> + </target> + </serial> + <console type='file'> + <source path='/tmp/serial.file'> + <seclabel model='dac' relabel='no'/> + </source> + <target type='serial' port='0'/> + </console> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <audio id='1' type='none'/> + <memballoon model='virtio'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </memballoon> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/serial-append.off.xml b/tests/qemuxml2xmloutdata/serial-append.off.xml new file mode 100644 index 0000000000..83fd37a0d1 --- /dev/null +++ b/tests/qemuxml2xmloutdata/serial-append.off.xml @@ -0,0 +1,53 @@ +<domain type='qemu'> + <name>machine</name> + <uuid>2187c512-ff97-47d7-b67c-c02d3bdc219d</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <controller type='usb' index='0' model='piix3-uhci'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <serial type='file'> + <source path='/tmp/serial.file' append='off'> + <seclabel model='dac' relabel='no'/> + </source> + <target type='isa-serial' port='0'> + <model name='isa-serial'/> + </target> + </serial> + <serial type='unix'> + <source mode='connect' path='/tmp/serial.sock'> + <seclabel model='dac' relabel='no'/> + </source> + <target type='isa-serial' port='1'> + <model name='isa-serial'/> + </target> + </serial> + <console type='file'> + <source path='/tmp/serial.file' append='off'> + <seclabel model='dac' relabel='no'/> + </source> + <target type='serial' port='0'/> + </console> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <audio id='1' type='none'/> + <memballoon model='virtio'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </memballoon> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/serial-append.on.xml b/tests/qemuxml2xmloutdata/serial-append.on.xml new file mode 100644 index 0000000000..e54959a725 --- /dev/null +++ b/tests/qemuxml2xmloutdata/serial-append.on.xml @@ -0,0 +1,53 @@ +<domain type='qemu'> + <name>machine</name> + <uuid>2187c512-ff97-47d7-b67c-c02d3bdc219d</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <controller type='usb' index='0' model='piix3-uhci'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <serial type='file'> + <source path='/tmp/serial.file' append='on'> + <seclabel model='dac' relabel='no'/> + </source> + <target type='isa-serial' port='0'> + <model name='isa-serial'/> + </target> + </serial> + <serial type='unix'> + <source mode='connect' path='/tmp/serial.sock'> + <seclabel model='dac' relabel='no'/> + </source> + <target type='isa-serial' port='1'> + <model name='isa-serial'/> + </target> + </serial> + <console type='file'> + <source path='/tmp/serial.file' append='on'> + <seclabel model='dac' relabel='no'/> + </source> + <target type='serial' port='0'/> + </console> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <audio id='1' type='none'/> + <memballoon model='virtio'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </memballoon> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/serial-append.xml b/tests/qemuxml2xmloutdata/serial-append.xml new file mode 100644 index 0000000000..662a711dd0 --- /dev/null +++ b/tests/qemuxml2xmloutdata/serial-append.xml @@ -0,0 +1,53 @@ +<domain type='qemu'> + <name>machine</name> + <uuid>2187c512-ff97-47d7-b67c-c02d3bdc219d</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <controller type='usb' index='0' model='piix3-uhci'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <serial type='file'> + <source path='/tmp/serial.file'> + <seclabel model='dac' relabel='no'/> + </source> + <target type='isa-serial' port='0'> + <model name='isa-serial'/> + </target> + </serial> + <serial type='unix'> + <source mode='connect' path='/tmp/serial.sock'> + <seclabel model='dac' relabel='no'/> + </source> + <target type='isa-serial' port='1'> + <model name='isa-serial'/> + </target> + </serial> + <console type='file'> + <source path='/tmp/serial.file'> + <seclabel model='dac' relabel='no'/> + </source> + <target type='serial' port='0'/> + </console> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <audio id='1' type='none'/> + <memballoon model='virtio'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </memballoon> + </devices> +</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index e13da8bd2c..e4ccee0cf7 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -915,6 +915,16 @@ mymain(void) QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_EGD); + DO_TEST_NOCAPS("serial-append"); + + g_free(cfg->serialFileAppend); + cfg->serialFileAppend = g_strdup("on"); + DO_TEST_FULL("serial-append", ".on", WHEN_BOTH, ARG_END); + + g_free(cfg->serialFileAppend); + cfg->serialFileAppend = g_strdup("off"); + DO_TEST_FULL("serial-append", ".off", WHEN_BOTH, ARG_END); + DO_TEST_NOCAPS("cpu-numa1"); DO_TEST_NOCAPS("cpu-numa2"); DO_TEST_NOCAPS("cpu-numa-no-memory-element"); -- 2.39.0

3 5

[PATCH] NEWS: document addition of passt support
by Laine Stump 10 Jan '23

10 Jan '23

Signed-off-by: Laine Stump <laine(a)redhat.com> --- NEWS.rst | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index fecca64344..768208ed03 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -23,6 +23,16 @@ v9.0.0 (unreleased) ``virDomainSnapshotDelete()``. Flags that allow deleting children or children only are not supported. + * QEMU: support passt (https://passt.top) + + passt can be used to connect an emulated network device to the + host's network without requiring libvirt to have any sort of + elevated privileges. This is configured with:: + + <interface type='user'> + <backend type='passt'> + ... + * **Improvements** * qemu: Prefer PNG for domain screenshots -- 2.38.1

2 3

[PATCH] spec: Restart libvirtd on upgrade without socket activation
by Martin Kletzander 10 Jan '23

10 Jan '23

The %posttrans phase needs has a special case for upgrading libvirt daemon with --listen, but it forgot to also restart the daemon in order to run the new installed version. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1820437 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- libvirt.spec.in | 1 + 1 file changed, 1 insertion(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index d9529fc76c4a..77b274b6f91d 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1449,6 +1449,7 @@ then libvirtd-admin.socket \ libvirtd-tls.socket \ libvirtd-tcp.socket >/dev/null 2>&1 || : + /bin/systemctl try-restart libvirtd.service >/dev/null 2>&1 || : else # Old libvirtd owns the sockets and will delete them on # shutdown. Can't use a try-restart as libvirtd will simply -- 2.39.0

3 2

[libvirt PATCH 0/9] src: misc cleanups related to remote protocol/client
by Daniel P. Berrangé 10 Jan '23

10 Jan '23

Just before xmas I did some work on an rpcgen replacement so we can use a non-sucky API instead of xdr_*. This short series has some general cleanups I found useful. The rpcgen code will come later. While this is all non-functional changes, I'm NOT proposing it for 9.0, it can safely wait as it isn't fixing any real bugs (that I've realized). Daniel P. Berrangé (9): remote: remove redundant initialization of args variable lxc: fix XDR protocol compliance logging: remove redundant XDR typedef rpc: use VIR_LOCK_GUARD in remote client code remote: use VIR_LOCK_GUARD in client code admin: use VIR_LOCK_GUARD in client code rpc: use struct zero initializer instead of memset remote: use struct zero initializer instead of memset admin: use struct zero initializer instead of memset src/admin/admin_remote.c | 92 +-- src/logging/log_protocol.x | 2 - src/lxc/lxc_monitor_protocol.x | 6 +- src/remote/remote_driver.c | 1280 +++++++++----------------------- src/rpc/gendispatch.pl | 18 +- 5 files changed, 397 insertions(+), 1001 deletions(-) -- 2.38.1

2 10

[PATCH] qemu: Fix handling of passed FDs in remoteDispatchDomainFdAssociate
by Peter Krempa 10 Jan '23

10 Jan '23

To ensure same behaviour when remote driver is or is not used we must not steal the FDs and array holding them passed to qemuDomainFDAssociate but rather duplicate them. At the same time the remote driver must close and free them to prevent leak. Pointed out by Coverity as FD leak on error path: *** CID 404348: Resource leaks (RESOURCE_LEAK) /src/remote/remote_daemon_dispatch.c: 7484 in remoteDispatchDomainFdAssociate() 7478 rv = 0; 7479 7480 cleanup: 7481 if (rv < 0) 7482 virNetMessageSaveError(rerr); 7483 virObjectUnref(dom); >>> CID 404348: Resource leaks (RESOURCE_LEAK) >>> Variable "fds" going out of scope leaks the storage it points to. 7484 return rv; Fixes: abd9025c2fd Fixes: f762f87534e Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_driver.c | 15 ++++++++++++--- src/remote/remote_daemon_dispatch.c | 3 +++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index a88c9ebe64..d6879175fe 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -20442,7 +20442,8 @@ qemuDomainFDAssociate(virDomainPtr domain, { virDomainObj *vm = NULL; qemuDomainObjPrivate *priv; - virStorageSourceFDTuple *new; + g_autoptr(virStorageSourceFDTuple) new = NULL; + size_t i; int ret = -1; virCheckFlags(VIR_DOMAIN_FD_ASSOCIATE_SECLABEL_RESTORE | @@ -20460,8 +20461,16 @@ qemuDomainFDAssociate(virDomainPtr domain, priv = vm->privateData; new = virStorageSourceFDTupleNew(); - new->fds = fds; new->nfds = nfds; + new->fds = g_new0(int, new->nfds); + for (i = 0; i < new->nfds; i++) { + if ((new->fds[i] = dup(fds[i])) < 0) { + virReportSystemError(errno, + _("failed to duplicate passed fd with index '%zu'"), + i); + goto cleanup; + } + } new->conn = domain->conn; new->writable = flags & VIR_DOMAIN_FD_ASSOCIATE_SECLABEL_WRITABLE; @@ -20469,7 +20478,7 @@ qemuDomainFDAssociate(virDomainPtr domain, virCloseCallbacksDomainAdd(vm, domain->conn, qemuDomainFDHashCloseConnect); - g_hash_table_insert(priv->fds, g_strdup(name), new); + g_hash_table_insert(priv->fds, g_strdup(name), g_steal_pointer(&new)); ret = 0; diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon_dispatch.c index 40c734ce6b..6c56e9ec3e 100644 --- a/src/remote/remote_daemon_dispatch.c +++ b/src/remote/remote_daemon_dispatch.c @@ -7478,6 +7478,9 @@ remoteDispatchDomainFdAssociate(virNetServer *server G_GNUC_UNUSED, rv = 0; cleanup: + for (i = 0; i < nfds; i++) + VIR_FORCE_CLOSE(fds[i]); + g_free(fds); if (rv < 0) virNetMessageSaveError(rerr); virObjectUnref(dom); -- 2.38.1

2 1