From patchwork Tue Feb 12 11:39:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Prasad Pandit X-Patchwork-Id: 1040540 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43zLbw4CKSz9s3l for ; Tue, 12 Feb 2019 22:51:56 +1100 (AEDT) Received: from localhost ([127.0.0.1]:38053 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtWbS-0004tO-CK for incoming@patchwork.ozlabs.org; Tue, 12 Feb 2019 06:51:54 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51555) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtWb1-0004tE-8u for qemu-devel@nongnu.org; Tue, 12 Feb 2019 06:51:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtWat-0007x0-Il for qemu-devel@nongnu.org; Tue, 12 Feb 2019 06:51:22 -0500 Received: from mx1.redhat.com ([209.132.183.28]:49120) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gtWat-0007ue-9h; Tue, 12 Feb 2019 06:51:19 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 39E4A10F82; Tue, 12 Feb 2019 11:42:20 +0000 (UTC) Received: from localhost.localdomain (ovpn-117-19.sin2.redhat.com [10.67.117.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5F61560FDC; Tue, 12 Feb 2019 11:41:48 +0000 (UTC) From: P J P To: "Daniel P . Berrange" Date: Tue, 12 Feb 2019 17:09:29 +0530 Message-Id: <20190212113929.31390-1-ppandit@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Tue, 12 Feb 2019 11:42:20 +0000 (UTC) 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 v2] 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: Prasad J Pandit , qemu-ppc@nongnu.org, QEMU Developers , David Gibson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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é Fix-suggested-by: Daniel P. Berrangé Signed-off-by: Prasad J Pandit --- hw/core/machine.c | 46 +++++++++++++++++++++++++++++++++++++++++++++ hw/ppc/spapr.c | 36 +++++++++++++++++++++++++++++------ include/hw/boards.h | 2 ++ qemu-options.hx | 10 +++++++++- util/qemu-config.c | 8 ++++++++ 5 files changed, 95 insertions(+), 7 deletions(-) Update v2: add backward compatible properties -> https://lists.gnu.org/archive/html/qemu-devel/2019-02/msg00593.html diff --git a/hw/core/machine.c b/hw/core/machine.c index 2629515363..2d5a52476a 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -476,6 +476,38 @@ static void machine_set_memory_encryption(Object *obj, const char *value, ms->memory_encryption = g_strdup(value); } +static char *machine_get_host_serial(Object *obj, Error **errp) +{ + MachineState *ms = MACHINE(obj); + + return g_strdup(ms->host_serial); +} + +static void machine_set_host_serial(Object *obj, const char *value, + Error **errp) +{ + MachineState *ms = MACHINE(obj); + + g_free(ms->host_serial); + ms->host_serial = g_strdup(value); +} + +static char *machine_get_host_model(Object *obj, Error **errp) +{ + MachineState *ms = MACHINE(obj); + + return g_strdup(ms->host_model); +} + +static void machine_set_host_model(Object *obj, const char *value, + Error **errp) +{ + MachineState *ms = MACHINE(obj); + + g_free(ms->host_model); + ms->host_model = g_strdup(value); +} + void machine_class_allow_dynamic_sysbus_dev(MachineClass *mc, const char *type) { strList *item = g_new0(strList, 1); @@ -760,6 +792,18 @@ static void machine_class_init(ObjectClass *oc, void *data) &error_abort); object_class_property_set_description(oc, "memory-encryption", "Set memory encryption object to use", &error_abort); + + object_class_property_add_str(oc, "host-serial", + machine_get_host_serial, machine_set_host_serial, + &error_abort); + object_class_property_set_description(oc, "host-serial", + "Set host's system-id to use", &error_abort); + + object_class_property_add_str(oc, "host-model", + machine_get_host_model, machine_set_host_model, + &error_abort); + object_class_property_set_description(oc, "host-model", + "Set host's model-id to use", &error_abort); } static void machine_class_base_init(ObjectClass *oc, void *data) @@ -785,6 +829,8 @@ static void machine_initfn(Object *obj) ms->dump_guest_core = true; ms->mem_merge = true; ms->enable_graphics = true; + ms->host_serial = NULL; + ms->host_model = NULL; /* Register notifier when init is done for sysbus sanity checks */ ms->sysbus_notifier.notify = machine_init_notify; diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 0942f35bf8..a70667d72d 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1249,13 +1249,31 @@ static void *spapr_build_fdt(sPAPRMachineState *spapr, * 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 (machine->host_model && !g_str_equal(machine->host_model, "none")) { + if (g_str_equal(machine->host_model, "passthrough")) { + /* -M host-model=passthrough */ + if (kvmppc_get_host_model(&buf)) { + _FDT(fdt_setprop_string(fdt, 0, "host-model", buf)); + g_free(buf); + } + } else { + /* -M host-model= */ + _FDT(fdt_setprop_string(fdt, 0, "host-model", machine->host_model)); + } } - if (kvmppc_get_host_serial(&buf)) { - _FDT(fdt_setprop_string(fdt, 0, "host-serial", buf)); - g_free(buf); + + if (machine->host_serial && !g_str_equal(machine->host_serial, "none")) { + if (g_str_equal(machine->host_serial, "passthrough")) { + /* -M host-serial=passthrough */ + if (kvmppc_get_host_serial(&buf)) { + _FDT(fdt_setprop_string(fdt, 0, "host-serial", buf)); + g_free(buf); + } + } else { + /* -M host-serial= */ + _FDT(fdt_setprop_string(fdt, 0, + "host-serial", machine->host_serial)); + } } buf = qemu_uuid_unparse_strdup(&qemu_uuid); @@ -4080,9 +4098,15 @@ DEFINE_SPAPR_MACHINE(4_0, "4.0", true); static void spapr_machine_3_1_class_options(MachineClass *mc) { sPAPRMachineClass *smc = SPAPR_MACHINE_CLASS(mc); + static GlobalProperty compat[] = { + { TYPE_SPAPR_MACHINE, "host-model", "passthrough" }, + { TYPE_SPAPR_MACHINE, "host-serial", "passthrough" }, + }; 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 = POWERPC_CPU_TYPE_NAME("power8_v2.0"); smc->update_dt_enabled = false; } diff --git a/include/hw/boards.h b/include/hw/boards.h index 02f114085f..3e63dc4501 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -257,6 +257,8 @@ struct MachineState { bool enforce_config_section; bool enable_graphics; char *memory_encryption; + char *host_serial; + char *host_model; DeviceMemoryState *device_memory; ram_addr_t ram_size; diff --git a/qemu-options.hx b/qemu-options.hx index 521511ec13..67ac1a9959 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -43,7 +43,9 @@ DEF("machine", HAS_ARG, QEMU_OPTION_machine, \ " suppress-vmdesc=on|off disables self-describing migration (default=off)\n" " nvdimm=on|off controls NVDIMM support (default=off)\n" " enforce-config-section=on|off enforce configuration section migration (default=off)\n" - " memory-encryption=@var{} memory encryption object to use (default=none)\n", + " memory-encryption=@var{} memory encryption object to use (default=none)\n" + " host-serial=none|passthrough|string controls host systemd-id (default=passthrough)\n" + " host-model=none|passthrough|string controls host model-id (default=passthrough)\n", QEMU_ARCH_ALL) STEXI @item -machine [type=]@var{name}[,prop=@var{value}[,...]] @@ -103,6 +105,12 @@ NOTE: this parameter is deprecated. Please use @option{-global} @option{migration.send-configuration}=@var{on|off} instead. @item memory-encryption=@var{} Memory encryption object to use. The default is none. +@item host-serial=none|passthrough|string +Pass 'system-id' parameter from host's device-tree to a guest. A user may +disable it with 'none' or define a custom string for a guest. +@item host-model=none|passthrough|string +Pass 'model' paramter from host's device-tree to a guest. A user may disable +it with 'none' or define a custom string for a guest. @end table ETEXI diff --git a/util/qemu-config.c b/util/qemu-config.c index 9d2e278e29..86483ded34 100644 --- a/util/qemu-config.c +++ b/util/qemu-config.c @@ -238,6 +238,14 @@ static QemuOptsList machine_opts = { .help = "Up to 8 chars in set of [A-Za-z0-9. ](lower case chars" " converted to upper case) to pass to machine" " loader, boot manager, and guest kernel", + },{ + .name = "host-serial", + .type = QEMU_OPT_STRING, + .help = "host's system-id seen by guest", + },{ + .name = "host-model", + .type = QEMU_OPT_STRING, + .help = "host's model-id seen by guest", }, { /* End of list */ } }