From nobody Mon Apr 29 12:28:43 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 150756540898058.904779320783746; Mon, 9 Oct 2017 09:10:08 -0700 (PDT) Received: from localhost ([::1]:58704 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1acs-0003Pa-Mr for importer@patchew.org; Mon, 09 Oct 2017 12:09:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53919) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1aVI-0005rr-Pt for qemu-devel@nongnu.org; Mon, 09 Oct 2017 12:02:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e1aVD-0004Mb-2W for qemu-devel@nongnu.org; Mon, 09 Oct 2017 12:02:04 -0400 Received: from smtp02.citrix.com ([66.165.176.63]:48852) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1e1aVC-0004M0-P7 for qemu-devel@nongnu.org; Mon, 09 Oct 2017 12:01:58 -0400 X-IronPort-AV: E=Sophos;i="5.42,500,1500940800"; d="scan'208";a="450972892" From: Ian Jackson To: Date: Mon, 9 Oct 2017 17:01:35 +0100 Message-ID: <1507564902-9000-2-git-send-email-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1507564902-9000-1-git-send-email-ian.jackson@eu.citrix.com> References: <1507564902-9000-1-git-send-email-ian.jackson@eu.citrix.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 66.165.176.63 Subject: [Qemu-devel] [PATCH 1/8] xen: link against xentoolcore X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Juergen Gross , Stefano Stabellini , Ian Jackson , Ross Lagerwall , Anthony PERARD , xen-devel@lists.xenproject.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Anthony PERARD Xen libraries 4.10 will include a new xentoolcore library, without which xendevicemodel et al will not work. Signed-off-by: Ian Jackson --- configure | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/configure b/configure index fd7e3a5..6f691df 100755 --- a/configure +++ b/configure @@ -2072,7 +2072,7 @@ if test "$xen" !=3D "no" ; then $($pkg_config --modversion xencontrol | sed 's/\./ /g') )" xen=3Dyes xen_pc=3D"xencontrol xenstore xenguest xenforeignmemory xengnttab" - xen_pc=3D"$xen_pc xenevtchn xendevicemodel" + xen_pc=3D"$xen_pc xenevtchn xendevicemodel xentoolcore" QEMU_CFLAGS=3D"$QEMU_CFLAGS $($pkg_config --cflags $xen_pc)" libs_softmmu=3D"$($pkg_config --libs $xen_pc) $libs_softmmu" LDFLAGS=3D"$($pkg_config --libs $xen_pc) $LDFLAGS" @@ -2104,18 +2104,20 @@ EOF cat > $TMPC < +#include int main(void) { xenforeignmemory_handle *xfmem; =20 xfmem =3D xenforeignmemory_open(0, 0); xenforeignmemory_map2(xfmem, 0, 0, 0, 0, 0, 0, 0); + xentoolcore_restrict_all(0); =20 return 0; } EOF - compile_prog "" "$xen_libs -lxendevicemodel $xen_stable_libs" + compile_prog "" "$xen_libs -lxendevicemodel $xen_stable_libs -lxen= toolcore" then - xen_stable_libs=3D"-lxendevicemodel $xen_stable_libs" + xen_stable_libs=3D"-lxendevicemodel $xen_stable_libs -lxentoolcore" xen_ctrl_version=3D41000 xen=3Dyes elif --=20 2.1.4 From nobody Mon Apr 29 12:28:43 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1507565482495707.9363506295452; Mon, 9 Oct 2017 09:11:22 -0700 (PDT) Received: from localhost ([::1]:58721 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1ae8-0004NG-OE for importer@patchew.org; Mon, 09 Oct 2017 12:11:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53917) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1aVI-0005rW-Io for qemu-devel@nongnu.org; Mon, 09 Oct 2017 12:02:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e1aVC-0004MI-LM for qemu-devel@nongnu.org; Mon, 09 Oct 2017 12:02:04 -0400 Received: from smtp.citrix.com ([66.165.176.89]:3781) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1e1aVC-0004Hj-DV for qemu-devel@nongnu.org; Mon, 09 Oct 2017 12:01:58 -0400 X-IronPort-AV: E=Sophos;i="5.42,500,1500940800"; d="scan'208";a="443013707" From: Ian Jackson To: Date: Mon, 9 Oct 2017 17:01:36 +0100 Message-ID: <1507564902-9000-3-git-send-email-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1507564902-9000-1-git-send-email-ian.jackson@eu.citrix.com> References: <1507564902-9000-1-git-send-email-ian.jackson@eu.citrix.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 66.165.176.89 Subject: [Qemu-devel] [PATCH 2/8] xen: restrict: use xentoolcore_restrict_all X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Juergen Gross , Stefano Stabellini , Ian Jackson , Ross Lagerwall , Anthony PERARD , xen-devel@lists.xenproject.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" And insist that it works. Drop individual use of xendevicemodel_restrict and xenforeignmemory_restrict. These are not actually effective in this version of qemu, because qemu has a large number of fds open onto various Xen control devices. The restriction arrangements are still not right, because the restriction needs to be done very late - after qemu has opened all of its control fds. xentoolcore_restrict_all and xentoolcore.h are available in Xen 4.10 and later, only. Provide a compatibility stub. And drop the compatibility stubs for the old functions. Signed-off-by: Ian Jackson Reviewed-by: Anthony PERARD --- v2: Modify the compatibility code, too. Bump this patch ahead of "defer call to xen_restrict until running" Retain call to xentoolcore_restrict_all Signed-off-by: Ian Jackson --- include/hw/xen/xen_common.h | 46 +++++++++++------------------------------= ---- 1 file changed, 11 insertions(+), 35 deletions(-) diff --git a/include/hw/xen/xen_common.h b/include/hw/xen/xen_common.h index 86c7f26..3f44a63 100644 --- a/include/hw/xen/xen_common.h +++ b/include/hw/xen/xen_common.h @@ -91,6 +91,16 @@ static inline void *xenforeignmemory_map2(xenforeignmemo= ry_handle *h, return xenforeignmemory_map(h, dom, prot, pages, arr, err); } =20 +static inline int xentoolcore_restrict_all(domid_t domid) +{ + errno =3D ENOTTY; + return -1; +} + +#else /* CONFIG_XEN_CTRL_INTERFACE_VERSION >=3D 41000 */ + +#include + #endif =20 #if CONFIG_XEN_CTRL_INTERFACE_VERSION < 40900 @@ -218,20 +228,6 @@ static inline int xendevicemodel_set_mem_type( return xc_hvm_set_mem_type(dmod, domid, mem_type, first_pfn, nr); } =20 -static inline int xendevicemodel_restrict( - xendevicemodel_handle *dmod, domid_t domid) -{ - errno =3D ENOTTY; - return -1; -} - -static inline int xenforeignmemory_restrict( - xenforeignmemory_handle *fmem, domid_t domid) -{ - errno =3D ENOTTY; - return -1; -} - #else /* CONFIG_XEN_CTRL_INTERFACE_VERSION >=3D 40900 */ =20 #undef XC_WANT_COMPAT_DEVICEMODEL_API @@ -290,28 +286,8 @@ static inline int xen_modified_memory(domid_t domid, u= int64_t first_pfn, static inline int xen_restrict(domid_t domid) { int rc; - - /* Attempt to restrict devicemodel operations */ - rc =3D xendevicemodel_restrict(xen_dmod, domid); + rc =3D xentoolcore_restrict_all(domid); trace_xen_domid_restrict(rc ? errno : 0); - - if (rc < 0) { - /* - * If errno is ENOTTY then restriction is not implemented so - * there's no point in trying to restrict other types of - * operation, but it should not be treated as a failure. - */ - if (errno =3D=3D ENOTTY) { - return 0; - } - - return rc; - } - - /* Restrict foreignmemory operations */ - rc =3D xenforeignmemory_restrict(xen_fmem, domid); - trace_xen_domid_restrict(rc ? errno : 0); - return rc; } =20 --=20 2.1.4 From nobody Mon Apr 29 12:28:43 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1507565327877959.7536260602359; Mon, 9 Oct 2017 09:08:47 -0700 (PDT) Received: from localhost ([::1]:58702 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1abl-0002Oz-3t for importer@patchew.org; Mon, 09 Oct 2017 12:08:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53906) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1aVG-0005pv-Uz for qemu-devel@nongnu.org; Mon, 09 Oct 2017 12:02:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e1aVD-0004Mi-3q for qemu-devel@nongnu.org; Mon, 09 Oct 2017 12:02:03 -0400 Received: from smtp.citrix.com ([66.165.176.89]:3781) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1e1aVC-0004Hj-Rg for qemu-devel@nongnu.org; Mon, 09 Oct 2017 12:01:59 -0400 X-IronPort-AV: E=Sophos;i="5.42,500,1500940800"; d="scan'208";a="443013708" From: Ian Jackson To: Date: Mon, 9 Oct 2017 17:01:37 +0100 Message-ID: <1507564902-9000-4-git-send-email-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1507564902-9000-1-git-send-email-ian.jackson@eu.citrix.com> References: <1507564902-9000-1-git-send-email-ian.jackson@eu.citrix.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 66.165.176.89 Subject: [Qemu-devel] [PATCH 3/8] xen: defer call to xen_restrict until just before os_setup_post X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Juergen Gross , Stefano Stabellini , Ian Jackson , Ross Lagerwall , Anthony PERARD , xen-devel@lists.xenproject.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" We need to restrict *all* the control fds that qemu opens. Looking in /proc/PID/fd shows there are many; their allocation seems scattered throughout Xen support code in qemu. We must postpone the restrict call until roughly the same time as qemu changes its uid, chroots (if applicable), and so on. There doesn't seem to be an appropriate hook already. The RunState change hook fires at different times depending on exactly what mode qemu is operating in. And it appears that no-one but the Xen code wants a hook at this phase of execution. So, introduce a bare call to a new function xen_setup_post, just before os_setup_post. Also provide the appropriate stub for when Xen compilation is disabled. We do the restriction before rather than after os_setup_post, because xen_restrict may need to open /dev/null, and os_setup_post might have called chroot. Signed-off-by: Ian Jackson Reviewed-by: Anthony PERARD --- v3: Do xen_setup_post just before, not just after, os_setup_post, to improve interaction with chroot. Thanks to Ross Lagerwall. --- hw/i386/xen/xen-hvm.c | 8 -------- hw/xen/xen-common.c | 13 +++++++++++++ include/sysemu/sysemu.h | 2 ++ stubs/xen-hvm.c | 5 +++++ vl.c | 1 + 5 files changed, 21 insertions(+), 8 deletions(-) diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c index d9ccd5d..7b60ec6 100644 --- a/hw/i386/xen/xen-hvm.c +++ b/hw/i386/xen/xen-hvm.c @@ -1254,14 +1254,6 @@ void xen_hvm_init(PCMachineState *pcms, MemoryRegion= **ram_memory) goto err; } =20 - if (xen_domid_restrict) { - rc =3D xen_restrict(xen_domid); - if (rc < 0) { - error_report("failed to restrict: error %d", errno); - goto err; - } - } - xen_create_ioreq_server(xen_domid, &state->ioservid); =20 state->exit.notify =3D xen_exit_notifier; diff --git a/hw/xen/xen-common.c b/hw/xen/xen-common.c index 632a938..4056420 100644 --- a/hw/xen/xen-common.c +++ b/hw/xen/xen-common.c @@ -117,6 +117,19 @@ static void xen_change_state_handler(void *opaque, int= running, } } =20 +void xen_setup_post(void) +{ + int rc; + + if (xen_domid_restrict) { + rc =3D xen_restrict(xen_domid); + if (rc < 0) { + perror("xen: failed to restrict"); + exit(1); + } + } +} + static int xen_init(MachineState *ms) { xen_xc =3D xc_interface_open(0, 0, 0); diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index b213696..b064a55 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -93,6 +93,8 @@ void qemu_remove_machine_init_done_notifier(Notifier *not= ify); =20 void qemu_announce_self(void); =20 +void xen_setup_post(void); + extern int autostart; =20 typedef enum { diff --git a/stubs/xen-hvm.c b/stubs/xen-hvm.c index 3ca6c51..9701feb 100644 --- a/stubs/xen-hvm.c +++ b/stubs/xen-hvm.c @@ -13,6 +13,7 @@ #include "hw/xen/xen.h" #include "exec/memory.h" #include "qmp-commands.h" +#include "sysemu/sysemu.h" =20 int xen_pci_slot_get_pirq(PCIDevice *pci_dev, int irq_num) { @@ -61,3 +62,7 @@ void xen_hvm_init(PCMachineState *pcms, MemoryRegion **ra= m_memory) void qmp_xen_set_global_dirty_log(bool enable, Error **errp) { } + +void xen_setup_post(void) +{ +} diff --git a/vl.c b/vl.c index fb1f05b..ca06553 100644 --- a/vl.c +++ b/vl.c @@ -4792,6 +4792,7 @@ int main(int argc, char **argv, char **envp) vm_start(); } =20 + xen_setup_post(); os_setup_post(); =20 main_loop(); --=20 2.1.4 From nobody Mon Apr 29 12:28:43 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1507565220184155.83684777638632; Mon, 9 Oct 2017 09:07:00 -0700 (PDT) Received: from localhost ([::1]:58689 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1aa1-0000xC-Dq for importer@patchew.org; Mon, 09 Oct 2017 12:06:57 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53899) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1aVG-0005pG-4x for qemu-devel@nongnu.org; Mon, 09 Oct 2017 12:02:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e1aVD-0004N0-Ar for qemu-devel@nongnu.org; Mon, 09 Oct 2017 12:02:02 -0400 Received: from smtp02.citrix.com ([66.165.176.63]:48852) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1e1aVD-0004M0-4r for qemu-devel@nongnu.org; Mon, 09 Oct 2017 12:01:59 -0400 X-IronPort-AV: E=Sophos;i="5.42,500,1500940800"; d="scan'208";a="450972893" From: Ian Jackson To: Date: Mon, 9 Oct 2017 17:01:38 +0100 Message-ID: <1507564902-9000-5-git-send-email-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1507564902-9000-1-git-send-email-ian.jackson@eu.citrix.com> References: <1507564902-9000-1-git-send-email-ian.jackson@eu.citrix.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 66.165.176.63 Subject: [Qemu-devel] [PATCH 4/8] xen: destroy_hvm_domain: Move reason into a variable X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Juergen Gross , Stefano Stabellini , Ian Jackson , Ross Lagerwall , Anthony PERARD , xen-devel@lists.xenproject.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" We are going to want to reuse this. No functional change. Signed-off-by: Ian Jackson Reviewed-by: Anthony PERARD --- hw/i386/xen/xen-hvm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c index 7b60ec6..83420cd 100644 --- a/hw/i386/xen/xen-hvm.c +++ b/hw/i386/xen/xen-hvm.c @@ -1387,12 +1387,13 @@ void destroy_hvm_domain(bool reboot) xc_interface *xc_handle; int sts; =20 + unsigned int reason =3D reboot ? SHUTDOWN_reboot : SHUTDOWN_poweroff; + xc_handle =3D xc_interface_open(0, 0, 0); if (xc_handle =3D=3D NULL) { fprintf(stderr, "Cannot acquire xenctrl handle\n"); } else { - sts =3D xc_domain_shutdown(xc_handle, xen_domid, - reboot ? SHUTDOWN_reboot : SHUTDOWN_power= off); + sts =3D xc_domain_shutdown(xc_handle, xen_domid, reason); if (sts !=3D 0) { fprintf(stderr, "xc_domain_shutdown failed to issue %s, " "sts %d, %s\n", reboot ? "reboot" : "poweroff", --=20 2.1.4 From nobody Mon Apr 29 12:28:43 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1507565240201917.3714992842389; Mon, 9 Oct 2017 09:07:20 -0700 (PDT) Received: from localhost ([::1]:58696 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1aaL-0001Fd-Bn for importer@patchew.org; Mon, 09 Oct 2017 12:07:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53926) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1aVJ-0005sL-6d for qemu-devel@nongnu.org; Mon, 09 Oct 2017 12:02:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e1aVD-0004NS-Le for qemu-devel@nongnu.org; Mon, 09 Oct 2017 12:02:05 -0400 Received: from smtp02.citrix.com ([66.165.176.63]:48852) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1e1aVD-0004M0-Dz for qemu-devel@nongnu.org; Mon, 09 Oct 2017 12:01:59 -0400 X-IronPort-AV: E=Sophos;i="5.42,500,1500940800"; d="scan'208";a="450972895" From: Ian Jackson To: Date: Mon, 9 Oct 2017 17:01:39 +0100 Message-ID: <1507564902-9000-6-git-send-email-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1507564902-9000-1-git-send-email-ian.jackson@eu.citrix.com> References: <1507564902-9000-1-git-send-email-ian.jackson@eu.citrix.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 66.165.176.63 Subject: [Qemu-devel] [PATCH 5/8] xen: move xc_interface compatibility fallback further up the file X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Juergen Gross , Stefano Stabellini , Ian Jackson , Ross Lagerwall , Anthony PERARD , xen-devel@lists.xenproject.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" We are going to want to use the dummy xendevicemodel_handle type in new stub functions in the CONFIG_XEN_CTRL_INTERFACE_VERSION < 41000 section. So we need to provide that definition, or (as applicable) include the appropriate header, earlier in the file. (Ideally the newer compatibility layers would be at the bottom of the file, so that they can naturally benefit from the compatibility layers for earlier version. But that's rather too much for this series.) No functional change. Signed-off-by: Ian Jackson Acked-by: Anthony PERARD --- v2: New patch in v2 of the series --- include/hw/xen/xen_common.h | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/include/hw/xen/xen_common.h b/include/hw/xen/xen_common.h index 3f44a63..8efdb8a 100644 --- a/include/hw/xen/xen_common.h +++ b/include/hw/xen/xen_common.h @@ -78,6 +78,17 @@ static inline void *xenforeignmemory_map(xc_interface *h= , uint32_t dom, =20 extern xenforeignmemory_handle *xen_fmem; =20 +#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 40900 + +typedef xc_interface xendevicemodel_handle; + +#else /* CONFIG_XEN_CTRL_INTERFACE_VERSION >=3D 40900 */ + +#undef XC_WANT_COMPAT_DEVICEMODEL_API +#include + +#endif + #if CONFIG_XEN_CTRL_INTERFACE_VERSION < 41000 =20 #define XEN_COMPAT_PHYSMAP @@ -105,8 +116,6 @@ static inline int xentoolcore_restrict_all(domid_t domi= d) =20 #if CONFIG_XEN_CTRL_INTERFACE_VERSION < 40900 =20 -typedef xc_interface xendevicemodel_handle; - static inline xendevicemodel_handle *xendevicemodel_open( struct xentoollog_logger *logger, unsigned int open_flags) { @@ -228,11 +237,6 @@ static inline int xendevicemodel_set_mem_type( return xc_hvm_set_mem_type(dmod, domid, mem_type, first_pfn, nr); } =20 -#else /* CONFIG_XEN_CTRL_INTERFACE_VERSION >=3D 40900 */ - -#undef XC_WANT_COMPAT_DEVICEMODEL_API -#include - #endif =20 extern xendevicemodel_handle *xen_dmod; --=20 2.1.4 From nobody Mon Apr 29 12:28:43 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1507565576325551.6286645723288; Mon, 9 Oct 2017 09:12:56 -0700 (PDT) Received: from localhost ([::1]:58726 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1afh-0005TR-GG for importer@patchew.org; Mon, 09 Oct 2017 12:12:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53922) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1aVJ-0005s4-0n for qemu-devel@nongnu.org; Mon, 09 Oct 2017 12:02:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e1aVD-0004NG-Hb for qemu-devel@nongnu.org; Mon, 09 Oct 2017 12:02:05 -0400 Received: from smtp.citrix.com ([66.165.176.89]:3781) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1e1aVD-0004Hj-AW for qemu-devel@nongnu.org; Mon, 09 Oct 2017 12:01:59 -0400 X-IronPort-AV: E=Sophos;i="5.42,500,1500940800"; d="scan'208";a="443013712" From: Ian Jackson To: Date: Mon, 9 Oct 2017 17:01:40 +0100 Message-ID: <1507564902-9000-7-git-send-email-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1507564902-9000-1-git-send-email-ian.jackson@eu.citrix.com> References: <1507564902-9000-1-git-send-email-ian.jackson@eu.citrix.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 66.165.176.89 Subject: [Qemu-devel] [PATCH 6/8] xen: destroy_hvm_domain: Try xendevicemodel_shutdown X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Juergen Gross , Stefano Stabellini , Ian Jackson , Ross Lagerwall , Anthony PERARD , xen-devel@lists.xenproject.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" xc_interface_open etc. is not going to work if we have dropped privilege, but xendevicemodel_shutdown will if everything is new enough. xendevicemodel_shutdown is only availabe in Xen 4.10 and later, so provide a stub for earlier versions. Signed-off-by: Ian Jackson Reviewed-by: Anthony PERARD --- v2: Add compatibility stub for Xen < 4.10. Fix coding style. Signed-off-by: Ian Jackson --- hw/i386/xen/xen-hvm.c | 10 ++++++++++ include/hw/xen/xen_common.h | 7 +++++++ 2 files changed, 17 insertions(+) diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c index 83420cd..25b8b14 100644 --- a/hw/i386/xen/xen-hvm.c +++ b/hw/i386/xen/xen-hvm.c @@ -1386,9 +1386,19 @@ void destroy_hvm_domain(bool reboot) { xc_interface *xc_handle; int sts; + int rc; =20 unsigned int reason =3D reboot ? SHUTDOWN_reboot : SHUTDOWN_poweroff; =20 + if (xen_dmod) { + rc =3D xendevicemodel_shutdown(xen_dmod, xen_domid, reason); + if (!rc) { + return; + } + perror("xendevicemodel_shutdown failed"); + /* well, try the old thing then */ + } + xc_handle =3D xc_interface_open(0, 0, 0); if (xc_handle =3D=3D NULL) { fprintf(stderr, "Cannot acquire xenctrl handle\n"); diff --git a/include/hw/xen/xen_common.h b/include/hw/xen/xen_common.h index 8efdb8a..1d6fb57 100644 --- a/include/hw/xen/xen_common.h +++ b/include/hw/xen/xen_common.h @@ -108,6 +108,13 @@ static inline int xentoolcore_restrict_all(domid_t dom= id) return -1; } =20 +static inline int xendevicemodel_shutdown(xendevicemodel_handle *dmod, + domid_t domid, unsigned int reas= on) +{ + errno =3D ENOTTY; + return -1; +} + #else /* CONFIG_XEN_CTRL_INTERFACE_VERSION >=3D 41000 */ =20 #include --=20 2.1.4 From nobody Mon Apr 29 12:28:43 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1507565381897426.4022912489346; Mon, 9 Oct 2017 09:09:41 -0700 (PDT) Received: from localhost ([::1]:58703 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1aca-00036e-2K for importer@patchew.org; Mon, 09 Oct 2017 12:09:36 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53952) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1aVM-0005uI-1p for qemu-devel@nongnu.org; Mon, 09 Oct 2017 12:02:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e1aVD-0004Nx-U6 for qemu-devel@nongnu.org; Mon, 09 Oct 2017 12:02:08 -0400 Received: from smtp02.citrix.com ([66.165.176.63]:48852) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1e1aVD-0004M0-NG for qemu-devel@nongnu.org; Mon, 09 Oct 2017 12:01:59 -0400 X-IronPort-AV: E=Sophos;i="5.42,500,1500940800"; d="scan'208";a="450972897" From: Ian Jackson To: Date: Mon, 9 Oct 2017 17:01:41 +0100 Message-ID: <1507564902-9000-8-git-send-email-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1507564902-9000-1-git-send-email-ian.jackson@eu.citrix.com> References: <1507564902-9000-1-git-send-email-ian.jackson@eu.citrix.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 66.165.176.63 Subject: [Qemu-devel] [PATCH 7/8] os-posix: Provide new -runas . facility X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Juergen Gross , Stefano Stabellini , Ian Jackson , Ross Lagerwall , Anthony PERARD , xen-devel@lists.xenproject.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This allows the caller to specify a uid and gid to use, even if there is no corresponding password entry. This will be useful in certain Xen configurations. We don't support just -runas because: (i) deprivileging without calling setgroups would be ineffective (ii) given only a uid we don't know what gid we ought to use (since uids may eppear in multiple passwd file entries with different gids). Signed-off-by: Ian Jackson --- v4: Changed to reuse option -runas v3: Error messages fixed. Thanks to Peter Maydell and Ross Lagerwall. v2: Coding style fixes. --- os-posix.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++------= ---- qemu-options.hx | 3 ++- 2 files changed, 55 insertions(+), 12 deletions(-) diff --git a/os-posix.c b/os-posix.c index 92e9d85..9418bd4 100644 --- a/os-posix.c +++ b/os-posix.c @@ -43,6 +43,8 @@ #endif =20 static struct passwd *user_pwd; +static uid_t user_uid =3D (uid_t)-1; +static gid_t user_gid =3D (gid_t)-1; static const char *chroot_dir; static int daemonize; static int daemon_pipe; @@ -128,6 +130,34 @@ void os_set_proc_name(const char *s) #endif } =20 + +static bool os_parse_runas_uid_gid(const char *optarg) +{ + unsigned long lv; + char *ep; + uid_t got_uid; + gid_t got_gid; + int rc; + + errno =3D 0; + lv =3D strtoul(optarg, &ep, 0); /* can't qemu_strtoul, want *ep=3D=3D'= .' */ + got_uid =3D lv; /* overflow here is ID in C99 */ + if (errno || *ep !=3D '.' || got_uid !=3D lv || got_uid =3D=3D (uid_t)= -1) { + return false; + } + + lv =3D 0; + rc =3D qemu_strtoul(ep + 1, 0, 0, &lv); + got_gid =3D lv; /* overflow here is ID in C99 */ + if (rc || got_gid !=3D lv || got_gid =3D=3D (gid_t)-1) { + return false; + } + + user_uid =3D got_uid; + user_gid =3D got_gid; + return true; +} + /* * Parse OS specific command line options. * return 0 if option handled, -1 otherwise @@ -145,8 +175,10 @@ void os_parse_cmd_args(int index, const char *optarg) #endif case QEMU_OPTION_runas: user_pwd =3D getpwnam(optarg); - if (!user_pwd) { - fprintf(stderr, "User \"%s\" doesn't exist\n", optarg); + if (!user_pwd && !os_parse_runas_uid_gid(optarg)) { + fprintf(stderr, + "User \"%s\" doesn't exist (and is not .)\n", + optarg); exit(1); } break; @@ -166,18 +198,28 @@ void os_parse_cmd_args(int index, const char *optarg) =20 static void change_process_uid(void) { - if (user_pwd) { - if (setgid(user_pwd->pw_gid) < 0) { - fprintf(stderr, "Failed to setgid(%d)\n", user_pwd->pw_gid); + if (user_pwd || user_uid !=3D (uid_t)-1) { + gid_t intended_gid =3D user_pwd ? user_pwd->pw_gid : user_gid; + uid_t intended_uid =3D user_pwd ? user_pwd->pw_uid : user_uid; + if (setgid(intended_gid) < 0) { + fprintf(stderr, "Failed to setgid(%d)\n", intended_gid); exit(1); } - if (initgroups(user_pwd->pw_name, user_pwd->pw_gid) < 0) { - fprintf(stderr, "Failed to initgroups(\"%s\", %d)\n", - user_pwd->pw_name, user_pwd->pw_gid); - exit(1); + if (user_pwd) { + if (initgroups(user_pwd->pw_name, user_pwd->pw_gid) < 0) { + fprintf(stderr, "Failed to initgroups(\"%s\", %d)\n", + user_pwd->pw_name, user_pwd->pw_gid); + exit(1); + } + } else { + if (setgroups(1, &user_gid) < 0) { + fprintf(stderr, "Failed to setgroups(1, [%d])", + user_gid); + exit(1); + } } - if (setuid(user_pwd->pw_uid) < 0) { - fprintf(stderr, "Failed to setuid(%d)\n", user_pwd->pw_uid); + if (setuid(intended_uid) < 0) { + fprintf(stderr, "Failed to setuid(%d)\n", intended_uid); exit(1); } if (setuid(0) !=3D -1) { diff --git a/qemu-options.hx b/qemu-options.hx index 9f6e2ad..bdff99f 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -3958,7 +3958,8 @@ ETEXI =20 #ifndef _WIN32 DEF("runas", HAS_ARG, QEMU_OPTION_runas, \ - "-runas user change to user id user just before starting the VM\n", + "-runas user change to user id user just before starting the VM\n"= \ + " user can be numeric uid.gid instead\n", QEMU_ARCH_ALL) #endif STEXI --=20 2.1.4 From nobody Mon Apr 29 12:28:43 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1507565173338143.69720758168785; Mon, 9 Oct 2017 09:06:13 -0700 (PDT) Received: from localhost ([::1]:58677 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1aZ7-0000D5-6F for importer@patchew.org; Mon, 09 Oct 2017 12:06:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53888) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1aVF-0005mx-0b for qemu-devel@nongnu.org; Mon, 09 Oct 2017 12:02:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e1aVD-0004O6-Vb for qemu-devel@nongnu.org; Mon, 09 Oct 2017 12:02:01 -0400 Received: from smtp.citrix.com ([66.165.176.89]:3781) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1e1aVD-0004Hj-Pr for qemu-devel@nongnu.org; Mon, 09 Oct 2017 12:01:59 -0400 X-IronPort-AV: E=Sophos;i="5.42,500,1500940800"; d="scan'208";a="443013714" From: Ian Jackson To: Date: Mon, 9 Oct 2017 17:01:42 +0100 Message-ID: <1507564902-9000-9-git-send-email-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1507564902-9000-1-git-send-email-ian.jackson@eu.citrix.com> References: <1507564902-9000-1-git-send-email-ian.jackson@eu.citrix.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 66.165.176.89 Subject: [Qemu-devel] [PATCH 8/8] configure: do_compiler: Dump some extra info under bash X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Juergen Gross , Stefano Stabellini , Ian Jackson , Ross Lagerwall , Anthony PERARD , xen-devel@lists.xenproject.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This makes it much easier to find a particular thing in config.log. The information may be lacking in other shells, resulting in harmless empty output. (This is why we don't use the proper ${FUNCNAME[*]} array syntax - other shells will choke on that.) The extra output is only printed if configure is run with bash. The something), it is necessary to say bash ./configure to get the extra debug info in the log. Signed-off-by: Ian Jackson --- v4: No longer tag this patch RFC. --- configure | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configure b/configure index 6f691df..21a2b15 100755 --- a/configure +++ b/configure @@ -60,6 +60,10 @@ do_compiler() { # is compiler binary to execute. local compiler=3D"$1" shift + echo >>config.log " +funcs: ${FUNCNAME} +lines: ${BASH_LINENO} +files: ${BASH_SOURCE}" echo $compiler "$@" >> config.log $compiler "$@" >> config.log 2>&1 || return $? # Test passed. If this is an --enable-werror build, rerun --=20 2.1.4