mirror of
https://github.com/izzy2lost/xemu.git
synced 2026-07-06 00:20:22 -07:00
Merge tag 'next-pr-pull-request' of https://gitlab.com/berrange/qemu into staging
Merge crypto and other misc fixes / features * Increase minimum gnutls to 3.7.5 * Increase minimum libgcrypt to 1.9.4 * Increase minimum nettle to 3.7.3 * Drop obsolete in-tree XTS impl * Fix memory leak when loading certificates * Remove/reduce duplication when loading certifcates * Fix possible crash when certificates are unloaded while an active TLS connection is using when in a TLS handshake operation * Deprecate use of dh-params.pem file * Document how to create certificates with Post-Quantum Cryptography compliant algorithms. * Support loading multiple certificate identities to allow support for Post-Quantum crypto in parallel with traditional RSA/ECC * Add "-run-with exit-with-parent=on" parameter * Flush pending errors when seeing ENOBUFS with a zero-copy send attempt * Fix data buffer parameters in hash & IO channel APIs to use 'void *' # -----BEGIN PGP SIGNATURE----- # # iQIzBAABCAAdFiEE2vOm/bJrYpEtDo4/vobrtBUQT98FAmkIr/8ACgkQvobrtBUQ # T9+2RhAAhEak/krdlTJw8OlJonUop7G5mlLU2TEoX0duRORcFhScsdSwb2pyc/wM # tnwfWXsnsKFItJx1y3STkOICtdNqizGoU3+c7wl4anQBurydu+XTs4ESBtVJtMYr # 1lTYvp0HFyKvaXwDWKE+ztltlJiog51tHPDLUIBCnyJysLVqxCHMHmkbG46IPBZo # A2XXxp3j/VBPmhls0JHpbAD4iVE3PChdK7zhyeGe/rld9+0JA12EPCvZ5Uokdj41 # aYP/okvnVH1atucoygPdDE3P5GYBKaSXZUWqzfkKhU7FgaF2863Td7ff1ip+WyWN # FFPNEU1hVg+T5hfsZVQmmIFDdSJWqoZaZM/WJVYdrRY4dKUCPnJ9OINbbnhuWz5E # JFmZOPibRZKQ44XcHX49JRfJEBvoq1z9OT1r7HkEP4D9/O7V/riIunbAESMk0sgi # 0/fatvdhNKMN6YBQM3mtN3yNOcfRSWFtSy9XS9zDjdpEKT7ui2t9FC0ZNSP0FRkS # aTY31FyacjHwU3zaoh6NoqqpxV9wwHrgsJwNbA/IztjmX/jvGG0Gb/sXVEqM59tR # e3VWTmlmZ1T8OLImh1hG4t+nY+XzI64QpVX8H9RCGm21o28DyTcOnTFK4OyIfWe5 # ttnNfEJN8WCVCsA8tcM8yAbZ/0qXrYfiZSO7hq79wE7LvyholAQ= # =9ESG # -----END PGP SIGNATURE----- # gpg: Signature made Mon 03 Nov 2025 02:37:03 PM CET # gpg: using RSA key DAF3A6FDB26B62912D0E8E3FBE86EBB415104FDF # gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>" [unknown] # gpg: aka "Daniel P. Berrange <berrange@redhat.com>" [unknown] # gpg: WARNING: This key is not certified with a trusted signature! # gpg: There is no indication that the signature belongs to the owner. # Primary key fingerprint: DAF3 A6FD B26B 6291 2D0E 8E3F BE86 EBB4 1510 4FDF * tag 'next-pr-pull-request' of https://gitlab.com/berrange/qemu: (32 commits) docs: creation of x509 certs compliant with post-quantum crypto crypto: support upto 5 parallel certificate identities crypto: expand logic to cope with multiple certificate identities crypto: avoid loading the identity certs twice crypto: avoid loading the CA certs twice crypto: deprecate use of external dh-params.pem file crypto: make TLS credentials structs private crypto: fix lifecycle handling of gnutls credentials objects crypto: introduce a wrapper around gnutls credentials crypto: introduce method for reloading TLS creds crypto: reduce duplication in handling TLS priority strings crypto: remove duplication loading x509 CA cert crypto: shorten the endpoint == server check in TLS creds crypto: move release of DH parameters into TLS creds parent crypto: remove needless indirection via parent_obj field crypto: use g_autofree when loading x509 credentials crypto: move check for TLS creds 'dir' property crypto: remove redundant access() checks before loading certs crypto: replace stat() with access() for credential checks crypto: add missing free of certs array ... Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
@@ -0,0 +1,140 @@
|
||||
/*
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
* Originally derived from nbdkit common/utils/exit-with-parent.c
|
||||
* Copyright Red Hat
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are
|
||||
* met:
|
||||
*
|
||||
* * Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
*
|
||||
* * Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
*
|
||||
* * Neither the name of Red Hat nor the names of its contributors may be
|
||||
* used to endorse or promote products derived from this software without
|
||||
* specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY RED HAT AND CONTRIBUTORS ''AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
|
||||
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
|
||||
* PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL RED HAT OR
|
||||
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
|
||||
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
||||
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
|
||||
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
/*
|
||||
* Implement the --exit-with-parent feature on operating systems which
|
||||
* support it.
|
||||
*/
|
||||
|
||||
#include "qemu/osdep.h"
|
||||
#include "qemu/exit-with-parent.h"
|
||||
|
||||
#if defined(__linux__)
|
||||
|
||||
#include <sys/prctl.h>
|
||||
|
||||
/*
|
||||
* Send SIGTERM to self when the parent exits. This will cause
|
||||
* qemu_system_killed() to be called.
|
||||
*
|
||||
* PR_SET_PDEATHSIG has been defined since Linux 2.1.57.
|
||||
*/
|
||||
int
|
||||
set_exit_with_parent(void)
|
||||
{
|
||||
return prctl(PR_SET_PDEATHSIG, SIGTERM);
|
||||
}
|
||||
|
||||
#elif defined(__FreeBSD__)
|
||||
|
||||
#include <sys/procctl.h>
|
||||
|
||||
/*
|
||||
* Send SIGTERM to self when the parent exits. This will cause
|
||||
* qemu_system_killed() to be called.
|
||||
*
|
||||
* PROC_PDEATHSIG_CTL has been defined since FreeBSD 11.2.
|
||||
*/
|
||||
int
|
||||
set_exit_with_parent(void)
|
||||
{
|
||||
const int sig = SIGTERM;
|
||||
return procctl(P_PID, 0, PROC_PDEATHSIG_CTL, (void *) &sig);
|
||||
}
|
||||
|
||||
#elif defined(__APPLE__)
|
||||
|
||||
/* For macOS. */
|
||||
|
||||
#include "qemu/thread.h"
|
||||
#include "qemu/error-report.h"
|
||||
#include "system/runstate.h"
|
||||
#include <sys/event.h>
|
||||
|
||||
static void *
|
||||
exit_with_parent_loop(void *vp)
|
||||
{
|
||||
const pid_t ppid = getppid();
|
||||
int fd;
|
||||
struct kevent kev, res[1];
|
||||
int r;
|
||||
|
||||
/* Register the kevent to wait for ppid to exit. */
|
||||
fd = kqueue();
|
||||
if (fd == -1) {
|
||||
error_report("exit_with_parent_loop: kqueue: %m");
|
||||
return NULL;
|
||||
}
|
||||
EV_SET(&kev, ppid, EVFILT_PROC, EV_ADD | EV_ENABLE, NOTE_EXIT, 0, NULL);
|
||||
if (kevent(fd, &kev, 1, NULL, 0, NULL) == -1) {
|
||||
error_report("exit_with_parent_loop: kevent: %m");
|
||||
close(fd);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* Wait for the kevent to happen. */
|
||||
r = kevent(fd, 0, 0, res, 1, NULL);
|
||||
if (r == 1 && res[0].ident == ppid) {
|
||||
/* Behave like Linux and FreeBSD above, as if SIGTERM was sent */
|
||||
qemu_system_killed(SIGTERM, ppid);
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
int
|
||||
set_exit_with_parent(void)
|
||||
{
|
||||
QemuThread exit_with_parent_thread;
|
||||
|
||||
/*
|
||||
* We have to block waiting for kevent, so that requires that we
|
||||
* start a background thread.
|
||||
*/
|
||||
qemu_thread_create(&exit_with_parent_thread,
|
||||
"exit-parent",
|
||||
exit_with_parent_loop, NULL,
|
||||
QEMU_THREAD_DETACHED);
|
||||
return 0;
|
||||
}
|
||||
|
||||
#else /* any platform that doesn't support this function */
|
||||
|
||||
int
|
||||
set_exit_with_parent(void)
|
||||
{
|
||||
g_assert_not_reached();
|
||||
}
|
||||
|
||||
#endif
|
||||
@@ -15,6 +15,7 @@ system_ss.add(files(
|
||||
'datadir.c',
|
||||
'dirtylimit.c',
|
||||
'dma-helpers.c',
|
||||
'exit-with-parent.c',
|
||||
'globals.c',
|
||||
'ioport.c',
|
||||
'ram-block-attributes.c',
|
||||
|
||||
+13
@@ -53,6 +53,7 @@
|
||||
#include "qemu/sockets.h"
|
||||
#include "qemu/accel.h"
|
||||
#include "qemu/async-teardown.h"
|
||||
#include "qemu/exit-with-parent.h"
|
||||
#include "hw/usb.h"
|
||||
#include "hw/isa/isa.h"
|
||||
#include "hw/scsi/scsi.h"
|
||||
@@ -783,6 +784,10 @@ static QemuOptsList qemu_run_with_opts = {
|
||||
.name = "chroot",
|
||||
.type = QEMU_OPT_STRING,
|
||||
},
|
||||
{
|
||||
.name = "exit-with-parent",
|
||||
.type = QEMU_OPT_BOOL,
|
||||
},
|
||||
{
|
||||
.name = "user",
|
||||
.type = QEMU_OPT_STRING,
|
||||
@@ -3691,6 +3696,14 @@ void qemu_init(int argc, char **argv)
|
||||
if (str) {
|
||||
os_set_chroot(str);
|
||||
}
|
||||
if (qemu_opt_get_bool(opts, "exit-with-parent", false)) {
|
||||
if (!can_exit_with_parent()) {
|
||||
error_report("exit-with-parent is not available"
|
||||
" on this platform");
|
||||
exit(1);
|
||||
}
|
||||
set_exit_with_parent();
|
||||
}
|
||||
str = qemu_opt_get(opts, "user");
|
||||
if (str) {
|
||||
if (!os_set_runas(str)) {
|
||||
|
||||
Reference in New Issue
Block a user