From nobody Sat May 4 04:18:41 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1550485147623249.84512615645644; Mon, 18 Feb 2019 02:19:07 -0800 (PST) Received: from localhost ([127.0.0.1]:55871 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gvg0r-0005tI-Jx for importer@patchew.org; Mon, 18 Feb 2019 05:19:01 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40967) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gvfxm-0004WK-Du for qemu-devel@nongnu.org; Mon, 18 Feb 2019 05:15:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gvfxk-0006r2-8l for qemu-devel@nongnu.org; Mon, 18 Feb 2019 05:15:49 -0500 Received: from mx1.redhat.com ([209.132.183.28]:36616) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gvfxk-0006qN-0S for qemu-devel@nongnu.org; Mon, 18 Feb 2019 05:15:48 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 54450539CA; Mon, 18 Feb 2019 10:14:37 +0000 (UTC) Received: from localhost.localdomain (ovpn-116-157.sin2.redhat.com [10.67.116.157]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C135F60158; Mon, 18 Feb 2019 10:14:21 +0000 (UTC) From: P J P To: David Gibson Date: Mon, 18 Feb 2019 15:42:18 +0530 Message-Id: <20190218101218.4177-1-ppandit@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Mon, 18 Feb 2019 10:14:37 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3] ppc: add host-serial and host-model machine attributes 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: qemu-ppc@nongnu.org, QEMU Developers , Prasad J Pandit Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Prasad J Pandit On ppc hosts, hypervisor shares following system attributes - /proc/device-tree/system-id - /proc/device-tree/model with a guest. This could lead to information leakage and misuse.[*] Add machine attributes to control such system information exposure to a guest. [*] https://wiki.openstack.org/wiki/OSSN/OSSN-0028 Reported-by: Daniel P. Berrang=C3=A9 Fix-suggested-by: Daniel P. Berrang=C3=A9 Signed-off-by: Prasad J Pandit Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Greg Kurz --- hw/ppc/spapr.c | 79 ++++++++++++++++++++++++++++++++++++++---- include/hw/ppc/spapr.h | 2 ++ 2 files changed, 75 insertions(+), 6 deletions(-) Update v3: move host-serial,host-model options to ppc sPAPR machine -> https://lists.gnu.org/archive/html/qemu-devel/2019-02/msg03182.html diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 0942f35bf8..666e500376 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1249,13 +1249,30 @@ static void *spapr_build_fdt(sPAPRMachineState *spa= pr, * Add info to guest to indentify which host is it being run on * and what is the uuid of the guest */ - if (kvmppc_get_host_model(&buf)) { - _FDT(fdt_setprop_string(fdt, 0, "host-model", buf)); - g_free(buf); + if (spapr->host_model && !g_str_equal(spapr->host_model, "none")) { + if (g_str_equal(spapr->host_model, "passthrough")) { + /* -M host-model=3Dpassthrough */ + if (kvmppc_get_host_model(&buf)) { + _FDT(fdt_setprop_string(fdt, 0, "host-model", buf)); + g_free(buf); + } + } else { + /* -M host-model=3D */ + _FDT(fdt_setprop_string(fdt, 0, "host-model", spapr->host_mode= l)); + } } - if (kvmppc_get_host_serial(&buf)) { - _FDT(fdt_setprop_string(fdt, 0, "host-serial", buf)); - g_free(buf); + + if (spapr->host_serial && !g_str_equal(spapr->host_serial, "none")) { + if (g_str_equal(spapr->host_serial, "passthrough")) { + /* -M host-serial=3Dpassthrough */ + if (kvmppc_get_host_serial(&buf)) { + _FDT(fdt_setprop_string(fdt, 0, "host-serial", buf)); + g_free(buf); + } + } else { + /* -M host-serial=3D */ + _FDT(fdt_setprop_string(fdt, 0, "host-serial", spapr->host_ser= ial)); + } } =20 buf =3D qemu_uuid_unparse_strdup(&qemu_uuid); @@ -3138,6 +3155,36 @@ static void spapr_set_ic_mode(Object *obj, const cha= r *value, Error **errp) } } =20 +static char *spapr_get_host_model(Object *obj, Error **errp) +{ + sPAPRMachineState *spapr =3D SPAPR_MACHINE(obj); + + return g_strdup(spapr->host_model); +} + +static void spapr_set_host_model(Object *obj, const char *value, Error **e= rrp) +{ + sPAPRMachineState *spapr =3D SPAPR_MACHINE(obj); + + g_free(spapr->host_model); + spapr->host_model =3D g_strdup(value); +} + +static char *spapr_get_host_serial(Object *obj, Error **errp) +{ + sPAPRMachineState *spapr =3D SPAPR_MACHINE(obj); + + return g_strdup(spapr->host_serial); +} + +static void spapr_set_host_serial(Object *obj, const char *value, Error **= errp) +{ + sPAPRMachineState *spapr =3D SPAPR_MACHINE(obj); + + g_free(spapr->host_serial); + spapr->host_serial =3D g_strdup(value); +} + static void spapr_instance_init(Object *obj) { sPAPRMachineState *spapr =3D SPAPR_MACHINE(obj); @@ -3183,6 +3230,20 @@ static void spapr_instance_init(Object *obj) object_property_set_description(obj, "ic-mode", "Specifies the interrupt controller mode (xics, xive, dua= l)", NULL); + + spapr->host_model =3D NULL; + object_property_add_str(obj, "host-model", + spapr_get_host_model, spapr_set_host_model, + &error_abort); + object_property_set_description(obj, "host-model", + "Set host's model-id to use - none|passthrough|string", &error_abo= rt); + + spapr->host_serial =3D NULL; + object_property_add_str(obj, "host-serial", + spapr_get_host_serial, spapr_set_host_serial, + &error_abort); + object_property_set_description(obj, "host-serial", + "Set host's system-id to use - none|passthrough|string", &error_ab= ort); } =20 static void spapr_machine_finalizefn(Object *obj) @@ -4080,9 +4141,15 @@ DEFINE_SPAPR_MACHINE(4_0, "4.0", true); static void spapr_machine_3_1_class_options(MachineClass *mc) { sPAPRMachineClass *smc =3D SPAPR_MACHINE_CLASS(mc); + static GlobalProperty compat[] =3D { + { TYPE_SPAPR_MACHINE, "host-model", "passthrough" }, + { TYPE_SPAPR_MACHINE, "host-serial", "passthrough" }, + }; =20 spapr_machine_4_0_class_options(mc); compat_props_add(mc->compat_props, hw_compat_3_1, hw_compat_3_1_len); + compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat)); + mc->default_cpu_type =3D POWERPC_CPU_TYPE_NAME("power8_v2.0"); smc->update_dt_enabled =3D false; } diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index a947a0a0dc..e004a570d8 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -177,6 +177,8 @@ struct sPAPRMachineState { =20 /*< public >*/ char *kvm_type; + char *host_model; + char *host_serial; =20 const char *icp_type; int32_t irq_map_nr; --=20 2.20.1