From nobody Sun Feb 8 16:19:15 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 ARC-Seal: i=1; a=rsa-sha256; t=1592217408; cv=none; d=zohomail.com; s=zohoarc; b=iDen1aDxt+NxSlUxLSbOHticfW4rGS8qxDLaP29RlbkZJ1BM0+bYiH6HST9wzwlzArAVYYnHYuqpSOmEatOCaYsxhk2sq0ngbcjH6EueEMs5c9qqC4LDKIoQu8CJJEFrF73kjHzSPcbPIFSTiePnl0XY++iyo3KmSRRXhLJkqjU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592217408; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=4qSJGRmIPBietpC17BvsS98p7G00d0dwSyICuIz3JT8=; b=BS/i6v/YgsgtmWQ4bGboF56ZtU/PUVaQOKI9gv3Xw7vllLmSjjq7JWHGL+9BvEdC0zc2RxMMFFqiqvqY0D2ndS+TxhPo32KQaX1iGIray9zeQyDshys2W2e0XAPYWGEuO9sF4RTB2HUyz/MKN0g+9J3f7gUHB1IkIS8RJfss108= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1592217408383554.0853942481533; Mon, 15 Jun 2020 03:36:48 -0700 (PDT) Received: from localhost ([::1]:51250 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jkmTu-00008L-U0 for importer@patchew.org; Mon, 15 Jun 2020 06:36:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52242) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jkmSh-0007I3-UB for qemu-devel@nongnu.org; Mon, 15 Jun 2020 06:35:31 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:60736 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jkmSf-0007GO-C2 for qemu-devel@nongnu.org; Mon, 15 Jun 2020 06:35:31 -0400 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-111-7lnQBj84NGWOHFcm4RC1zQ-1; Mon, 15 Jun 2020 06:35:16 -0400 Received: by mail-wm1-f70.google.com with SMTP id l2so4828369wmi.2 for ; Mon, 15 Jun 2020 03:35:16 -0700 (PDT) Received: from localhost.localdomain (181.red-88-10-103.dynamicip.rima-tde.net. [88.10.103.181]) by smtp.gmail.com with ESMTPSA id b19sm34451747wmj.0.2020.06.15.03.35.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jun 2020 03:35:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592217328; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4qSJGRmIPBietpC17BvsS98p7G00d0dwSyICuIz3JT8=; b=JYg/gSYn18U5nskKddadE9p8v9v42LuIXLYD6/bXOPWB6JR14T1wbXeoK1VIpTnzHb7LHQ 5C+3Wqe+nz1m/zuJo1cROdg7nVZOVRgBn024eA6UkFSXjg+9xpvtvoz8H0HlsLm8BNdycc g1CNtPVxzOoJZZYeOVdm3O8uut58+F0= X-MC-Unique: 7lnQBj84NGWOHFcm4RC1zQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4qSJGRmIPBietpC17BvsS98p7G00d0dwSyICuIz3JT8=; b=sECqFONpXTzHn0VfSwlYKVfv0VMTVAMyx9aYtBpsPwpVWADCbLq1/caoewdPgOdVeO nbvXMJ1zuXFisawKf+NoXPepPgoiPeYSXNx3P62yypj8RNXM8C7Ow+PLZ5mepGlynDdi X0DA2ULjb9QU395qh4fp0TTIN8IcTe0k3OcYskmprhy2Z8j6dEVuEZiOk8tgj1jVx96W y14NsYia8cm1mhPP0P6saVqRfolTsLTETllkH+5NJZI1j+2yDK1YUah9vloLp6KtXs8f FxIYWKsTo3/zejIdjGHClE5jAMOY5cqdu39MQ1SeOVSLEHrWnMH7Vow7LkftoNU981nM An6g== X-Gm-Message-State: AOAM5313NtVMeDgJ9BmWTEV6uoJCUsE2XNh+bHZCIHct+bZsf/+oiWtc 3dZ+qEPVBA/ECoAWtXOyFglwidCYvgeX5ZuVydqkflRPPuAsCcM0N5SEJOHvIcgGSzlSP/Qvbgt TU83RiUdJpKD/6Bs= X-Received: by 2002:adf:82c9:: with SMTP id 67mr30639305wrc.149.1592217315134; Mon, 15 Jun 2020 03:35:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx7Q0gggBx2KD2TIjoHv+PnMcnFzc+5i4fU0WWF+m/fMCWLPe65qg6KtN16z9nMr8WtEhvG0w== X-Received: by 2002:adf:82c9:: with SMTP id 67mr30639271wrc.149.1592217314833; Mon, 15 Jun 2020 03:35:14 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Gerd Hoffmann Subject: [PATCH v9 1/5] hw/nvram/fw_cfg: Add the FW_CFG_DATA_GENERATOR interface Date: Mon, 15 Jun 2020 12:34:53 +0200 Message-Id: <20200615103457.25282-2-philmd@redhat.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200615103457.25282-1-philmd@redhat.com> References: <20200615103457.25282-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=207.211.31.120; envelope-from=philmd@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/15 01:17:36 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Laszlo Ersek , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The FW_CFG_DATA_GENERATOR allows any object to produce blob of data consumable by the fw_cfg device. Reviewed-by: Laszlo Ersek Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- docs/specs/fw_cfg.txt | 9 ++++++- include/hw/nvram/fw_cfg.h | 52 +++++++++++++++++++++++++++++++++++++++ hw/nvram/fw_cfg.c | 36 +++++++++++++++++++++++++++ 3 files changed, 96 insertions(+), 1 deletion(-) diff --git a/docs/specs/fw_cfg.txt b/docs/specs/fw_cfg.txt index 8f1ebc66fa..bc16daa38a 100644 --- a/docs/specs/fw_cfg.txt +++ b/docs/specs/fw_cfg.txt @@ -219,7 +219,7 @@ To check the result, read the "control" field: =20 =3D Externally Provided Items =3D =20 -As of v2.4, "file" fw_cfg items (i.e., items with selector keys above +Since v2.4, "file" fw_cfg items (i.e., items with selector keys above FW_CFG_FILE_FIRST, and with a corresponding entry in the fw_cfg file directory structure) may be inserted via the QEMU command line, using the following syntax: @@ -230,6 +230,13 @@ Or =20 -fw_cfg [name=3D],string=3D =20 +Since v5.1, QEMU allows some objects to generate fw_cfg-specific content, +the content is then associated with a "file" item using the 'gen_id' option +in the command line, using the following syntax: + + -object ,id=3D,[generator-specific-optio= ns] \ + -fw_cfg [name=3D],gen_id=3D + See QEMU man page for more documentation. =20 Using item_name with plain ASCII characters only is recommended. diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h index 25d9307018..ca69666847 100644 --- a/include/hw/nvram/fw_cfg.h +++ b/include/hw/nvram/fw_cfg.h @@ -9,11 +9,43 @@ #define TYPE_FW_CFG "fw_cfg" #define TYPE_FW_CFG_IO "fw_cfg_io" #define TYPE_FW_CFG_MEM "fw_cfg_mem" +#define TYPE_FW_CFG_DATA_GENERATOR_INTERFACE "fw_cfg-data-generator" =20 #define FW_CFG(obj) OBJECT_CHECK(FWCfgState, (obj), TYPE_FW_CFG) #define FW_CFG_IO(obj) OBJECT_CHECK(FWCfgIoState, (obj), TYPE_FW_CFG_IO) #define FW_CFG_MEM(obj) OBJECT_CHECK(FWCfgMemState, (obj), TYPE_FW_CFG_MEM) =20 +#define FW_CFG_DATA_GENERATOR_CLASS(class) \ + OBJECT_CLASS_CHECK(FWCfgDataGeneratorClass, (class), \ + TYPE_FW_CFG_DATA_GENERATOR_INTERFACE) +#define FW_CFG_DATA_GENERATOR_GET_CLASS(obj) \ + OBJECT_GET_CLASS(FWCfgDataGeneratorClass, (obj), \ + TYPE_FW_CFG_DATA_GENERATOR_INTERFACE) + +typedef struct FWCfgDataGeneratorClass { + /*< private >*/ + InterfaceClass parent_class; + /*< public >*/ + + /** + * get_data: + * @obj: the object implementing this interface + * + * Returns: pointer to start of the generated item data + * + * The returned pointer is a QObject weak reference, @obj owns + * the reference and may free it at any time in the future. + */ + const void *(*get_data)(Object *obj); + /** + * get_length: + * @obj: the object implementing this interface + * + * Returns: the size of the generated item data in bytes + */ + size_t (*get_length)(Object *obj); +} FWCfgDataGeneratorClass; + typedef struct fw_cfg_file FWCfgFile; =20 #define FW_CFG_ORDER_OVERRIDE_VGA 70 @@ -263,6 +295,26 @@ void fw_cfg_add_file_callback(FWCfgState *s, const cha= r *filename, void *fw_cfg_modify_file(FWCfgState *s, const char *filename, void *data, size_t len); =20 +/** + * fw_cfg_add_from_generator: + * @s: fw_cfg device being modified + * @filename: name of new fw_cfg file item + * @gen_id: name of object implementing FW_CFG_DATA_GENERATOR interface + * @errp: pointer to a NULL initialized error object + * + * Add a new NAMED fw_cfg item with the content generated from the + * @gen_id object. The data generated by the @gen_id object is copied + * into the data structure of the fw_cfg device. + * The next available (unused) selector key starting at FW_CFG_FILE_FIRST + * will be used; also, a new entry will be added to the file directory + * structure residing at key value FW_CFG_FILE_DIR, containing the item na= me, + * data size, and assigned selector key value. + * + * Returns: the size of the generated item data on success, or 0 on errors. + */ +size_t fw_cfg_add_from_generator(FWCfgState *s, const char *filename, + const char *gen_id, Error **errp); + FWCfgState *fw_cfg_init_io_dma(uint32_t iobase, uint32_t dma_iobase, AddressSpace *dma_as); FWCfgState *fw_cfg_init_io(uint32_t iobase); diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index 8dd50c2c72..84578e83aa 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -1032,6 +1032,36 @@ void *fw_cfg_modify_file(FWCfgState *s, const char *= filename, return NULL; } =20 +size_t fw_cfg_add_from_generator(FWCfgState *s, const char *filename, + const char *gen_id, Error **errp) +{ + FWCfgDataGeneratorClass *klass; + Object *obj; + size_t size; + + obj =3D object_resolve_path_component(object_get_objects_root(), gen_i= d); + if (!obj) { + error_setg(errp, "Cannot find object ID '%s'", gen_id); + return 0; + } + if (!object_dynamic_cast(obj, TYPE_FW_CFG_DATA_GENERATOR_INTERFACE)) { + error_setg(errp, "Object ID '%s' is not a '%s' subclass", + gen_id, TYPE_FW_CFG_DATA_GENERATOR_INTERFACE); + return 0; + } + klass =3D FW_CFG_DATA_GENERATOR_GET_CLASS(obj); + size =3D klass->get_length(obj); + if (size =3D=3D 0) { + error_setg(errp, "Object ID '%s' failed to generate fw_cfg data", + gen_id); + return 0; + } + fw_cfg_add_file(s, filename, g_memdup(klass->get_data(obj), (guint)siz= e), + size); + + return size; +} + static void fw_cfg_machine_reset(void *opaque) { MachineClass *mc =3D MACHINE_GET_CLASS(qdev_get_machine()); @@ -1333,12 +1363,18 @@ static const TypeInfo fw_cfg_mem_info =3D { .class_init =3D fw_cfg_mem_class_init, }; =20 +static const TypeInfo fw_cfg_data_generator_interface_info =3D { + .name =3D TYPE_FW_CFG_DATA_GENERATOR_INTERFACE, + .parent =3D TYPE_INTERFACE, + .class_size =3D sizeof(FWCfgDataGeneratorClass), +}; =20 static void fw_cfg_register_types(void) { type_register_static(&fw_cfg_info); type_register_static(&fw_cfg_io_info); type_register_static(&fw_cfg_mem_info); + type_register_static(&fw_cfg_data_generator_interface_info); } =20 type_init(fw_cfg_register_types) --=20 2.21.3 From nobody Sun Feb 8 16:19:15 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 ARC-Seal: i=1; a=rsa-sha256; t=1592217484; cv=none; d=zohomail.com; s=zohoarc; b=RWY7ozjgpifgx/RwGDWWcRfuGJN3f8cJYqYIczfhMxcfSdZ7T/AkG6sLqPI2ev2K/MHSKMd23AqEvajUyA3/WCypBIVGHM4HPk1j6FzIaeCTAMFgHSLtKLffTs0u8XKniZINtYMXOjJR/PJ2ARnq1+pAaxkYlJswA6ZAOMdHPJs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592217484; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ezSdhy6Aj+NTw7gQiVSK0QVWg3UTTS4AwXL7eCoAu1Q=; b=nSU7wijbifuwBBpaqpOluow+azDunnNPqPl4v4FQk2b21ovu8n4gbgmfMCj2QvJsZuXAtACMvDyghoHUJrooq50nC3qCP2Ggagc7EyqvFnGXx1MVPu9XsgYZBMW/8tsSw/GliTfcfM6cMnAmf9tD6lHFcDLv5icZOeekGlcRkFQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1592217484832877.5031589127157; Mon, 15 Jun 2020 03:38:04 -0700 (PDT) Received: from localhost ([::1]:58216 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jkmV9-00033e-IY for importer@patchew.org; Mon, 15 Jun 2020 06:38:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52176) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jkmSc-0007Bq-0I for qemu-devel@nongnu.org; Mon, 15 Jun 2020 06:35:26 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:34807 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jkmSa-0007FY-5b for qemu-devel@nongnu.org; Mon, 15 Jun 2020 06:35:25 -0400 Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-183-cNQWPFAJPx2hOpFx3JrDNg-1; Mon, 15 Jun 2020 06:35:21 -0400 Received: by mail-wr1-f72.google.com with SMTP id e1so6902248wrm.3 for ; Mon, 15 Jun 2020 03:35:21 -0700 (PDT) Received: from localhost.localdomain (181.red-88-10-103.dynamicip.rima-tde.net. [88.10.103.181]) by smtp.gmail.com with ESMTPSA id a1sm22591268wmd.28.2020.06.15.03.35.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jun 2020 03:35:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592217323; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ezSdhy6Aj+NTw7gQiVSK0QVWg3UTTS4AwXL7eCoAu1Q=; b=DJlj1Tztav9RnDuXuSI4khDddD6eqbEEVBYdET5GMwHmeo9GmqPfRV/Pe5UHjKQtf1JgQo BugXUtkx4/yUv0osVHA6TjR8SkUBjPhqaY22bDCTaoSvLCILWz5jzheCK6rrM3NCgwWkov TyjTzuRgyrntjwgETaBWmYIss00aIcg= X-MC-Unique: cNQWPFAJPx2hOpFx3JrDNg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ezSdhy6Aj+NTw7gQiVSK0QVWg3UTTS4AwXL7eCoAu1Q=; b=gxr8/Cdnn3DL9oGyX73HAOiFIVLfLa/ReU1gK7QE7fR8TcknsWm9xjzFWeRpsLQ3Ki /egLpqydM4OPiL3CnBYsmSKh0+04jae3rUAe4aRos4bUoVsuJ1M71lb3oxGCXflPZziF 3Dqmfp+7aRNg5hWCfGCRPBCovHtUYxZKFrWkhjmHfq5AP2JrjhZZJoDgvzeGE2t7rXvz TqCuXB7BcSH0W/J8pM4jY6lbCqGvoXZL0g1RLPdwRA0WPHf47MSVXeuOAJ9HNl6rLm1j OPl+U5cqI70onSrjSf1dmHrgK2cUomdx2ytZuXW64m/0JZrRze4+JDNXmLyEKlN5Z/5i 5J4A== X-Gm-Message-State: AOAM533FH6bqCRt+/VpvxvsGydVfbNq7fs2lvSyq6Qrp5PlopxsOgKNB ClqTUDTJI2x8UsnbafzFMsdDTc9IS90//vfg9Fq2Q9BQurDPvsx5DGDq0fFG7zgpdMMlP0cv8K8 WOFlYZYvxFP3qRB4= X-Received: by 2002:adf:ee47:: with SMTP id w7mr27493581wro.171.1592217320319; Mon, 15 Jun 2020 03:35:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzqoJLHSJrFFer42pnF/Bkxj46aAZbd0lqPuLpeJV3wPguu39P73zNjjrew7BOJBya3O0DbHA== X-Received: by 2002:adf:ee47:: with SMTP id w7mr27493563wro.171.1592217320085; Mon, 15 Jun 2020 03:35:20 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Gerd Hoffmann Subject: [PATCH v9 2/5] softmmu/vl: Let -fw_cfg option take a 'gen_id' argument Date: Mon, 15 Jun 2020 12:34:54 +0200 Message-Id: <20200615103457.25282-3-philmd@redhat.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200615103457.25282-1-philmd@redhat.com> References: <20200615103457.25282-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=207.211.31.120; envelope-from=philmd@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/15 01:17:36 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Laszlo Ersek , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The 'gen_id' argument refers to a QOM object able to produce data consumable by the fw_cfg device. The producer object must implement the FW_CFG_DATA_GENERATOR interface. Reviewed-by: Laszlo Ersek Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- softmmu/vl.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/softmmu/vl.c b/softmmu/vl.c index f669c06ede..a46fe5c6c9 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -489,6 +489,11 @@ static QemuOptsList qemu_fw_cfg_opts =3D { .name =3D "string", .type =3D QEMU_OPT_STRING, .help =3D "Sets content of the blob to be inserted from a stri= ng", + }, { + .name =3D "gen_id", + .type =3D QEMU_OPT_STRING, + .help =3D "Sets id of the object generating the fw_cfg blob " + "to be inserted", }, { /* end of list */ } }, @@ -2020,7 +2025,7 @@ static int parse_fw_cfg(void *opaque, QemuOpts *opts,= Error **errp) { gchar *buf; size_t size; - const char *name, *file, *str; + const char *name, *file, *str, *gen_id; FWCfgState *fw_cfg =3D (FWCfgState *) opaque; =20 if (fw_cfg =3D=3D NULL) { @@ -2030,14 +2035,13 @@ static int parse_fw_cfg(void *opaque, QemuOpts *opt= s, Error **errp) name =3D qemu_opt_get(opts, "name"); file =3D qemu_opt_get(opts, "file"); str =3D qemu_opt_get(opts, "string"); + gen_id =3D qemu_opt_get(opts, "gen_id"); =20 - /* we need name and either a file or the content string */ - if (!(nonempty_str(name) && (nonempty_str(file) || nonempty_str(str)))= ) { - error_setg(errp, "invalid argument(s)"); - return -1; - } - if (nonempty_str(file) && nonempty_str(str)) { - error_setg(errp, "file and string are mutually exclusive"); + /* we need the name, and exactly one of: file, content string, gen_id = */ + if (!nonempty_str(name) || + nonempty_str(file) + nonempty_str(str) + nonempty_str(gen_id) !=3D= 1) { + error_setg(errp, "name, plus exactly one of file," + " string and gen_id, are needed"); return -1; } if (strlen(name) > FW_CFG_MAX_FILE_PATH - 1) { @@ -2052,6 +2056,11 @@ static int parse_fw_cfg(void *opaque, QemuOpts *opts= , Error **errp) if (nonempty_str(str)) { size =3D strlen(str); /* NUL terminator NOT included in fw_cfg blo= b */ buf =3D g_memdup(str, size); + } else if (nonempty_str(gen_id)) { + size_t fw_cfg_size; + + fw_cfg_size =3D fw_cfg_add_from_generator(fw_cfg, name, gen_id, er= rp); + return (fw_cfg_size > 0) ? 0 : -1; } else { GError *err =3D NULL; if (!g_file_get_contents(file, &buf, &size, &err)) { --=20 2.21.3 From nobody Sun Feb 8 16:19:15 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 ARC-Seal: i=1; a=rsa-sha256; t=1592217554; cv=none; d=zohomail.com; s=zohoarc; b=WepRLmFrHW0Ct2NMqw5L9mTSIbTHP2P/484o+2gIH1+IqYcU5F3KCZbaC1o8BP6FSAwWtYREV0Ew+H9lwP6CkwyywwoVKCpibtgmpcP9KY8186DeOUwvdZMEKhd/HM+9yFniEkqinAxw0wDdrMyC24bmSeSQHneKISaZIwEkB8c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592217554; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=yJ6lyDkcyYfNS0QPy5NgFjcVg41SXOpnPaTrA8KdGAA=; b=iZbbDzpfquy43qTJj1Z+p5Mi7SGXznFmbceFOgKgH7Du4wJ9Jgzj3tGwS3losTJl4UWaXv6ysFXytXNpx5huzvA2CNbxhd3TG6hupnT2Kjr1VKhRd3nU7VntF2QgfRwGMjbogPP6RSoSwGPEZUMPWOWKUaHi2A5pTETtGT7TKpw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 159221755466655.893804511442; Mon, 15 Jun 2020 03:39:14 -0700 (PDT) Received: from localhost ([::1]:34976 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jkmWH-000572-BI for importer@patchew.org; Mon, 15 Jun 2020 06:39:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52218) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jkmSg-0007GV-EH for qemu-devel@nongnu.org; Mon, 15 Jun 2020 06:35:30 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:46985 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jkmSe-0007GK-MB for qemu-devel@nongnu.org; Mon, 15 Jun 2020 06:35:30 -0400 Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-417-CmPcL8N0PJ6Mc-i7PlJ4QQ-1; Mon, 15 Jun 2020 06:35:26 -0400 Received: by mail-wr1-f71.google.com with SMTP id p9so6896707wrx.10 for ; Mon, 15 Jun 2020 03:35:26 -0700 (PDT) Received: from localhost.localdomain (181.red-88-10-103.dynamicip.rima-tde.net. [88.10.103.181]) by smtp.gmail.com with ESMTPSA id p7sm24223705wro.26.2020.06.15.03.35.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jun 2020 03:35:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592217328; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yJ6lyDkcyYfNS0QPy5NgFjcVg41SXOpnPaTrA8KdGAA=; b=FBGJf6xFFEKS0QxCclPaWAP62apONFrO6eeg1gR/HRKtpnl1/LJ0tysWmPXbPPvINY+Cdu XTuW80UBZzLsriW+x3K8O0hmEe/kU114ay37UL7O0rRycKY1+D/UULFAb46uLFNGOumvQp o/OpzuZQM4L0QLHWkbF4L09Mm8BksWU= X-MC-Unique: CmPcL8N0PJ6Mc-i7PlJ4QQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yJ6lyDkcyYfNS0QPy5NgFjcVg41SXOpnPaTrA8KdGAA=; b=HQL2rdZj73W5p3R9gyr4DgPNf12SjEVtYqO7W8saF+lRLqzyqny/U8sh3Io4zkqRqV AqFRBGaeUsETUaBjuxmaQvZM4PtkuQu6oHZLM5tBW3Z9DH+V1KRasbHk2oH+xNjy+7Qv ZT34yz9VeUlzwVZn08lf3fxMzgb5jNKfiZ8SJpK2roDJhcZOb0vnNUYUp/R+xCWyKKmf 1pqChgCjEACVO9yLDQ8+A5kvj21dl1HGii3qPno7Pd0IVdBAPbLY4Nd6ZFv0UZ5ioa3T IAZJw/FMWYN8aW/GCuprVl3UxAlpPb1FTjZjbs7IfM6Lv05U5SF+cGcLwjywENKiaRJu gysg== X-Gm-Message-State: AOAM533C/8trlywmhomfz0aHbL8LrWo7WSOAl68P4idX0p4DOwBXaqds 2T91rsADIsTwGLQkTonnCOnlUfpKC10j/JA0H0I3E7VfbOkaU41gVBEyLI1+v6GDj4LLGiaVTaj UoBvhNKB1LBi+kJk= X-Received: by 2002:adf:a491:: with SMTP id g17mr29888540wrb.132.1592217325286; Mon, 15 Jun 2020 03:35:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwPZ4Y9sEYVgkhNqMK10WxQvgjeT6Nvd9wxrH3xE6inGC3N30tI/IO/ui8wrAFRxrQBa7wgtg== X-Received: by 2002:adf:a491:: with SMTP id g17mr29888527wrb.132.1592217325065; Mon, 15 Jun 2020 03:35:25 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Gerd Hoffmann Subject: [PATCH v9 3/5] softmmu/vl: Allow -fw_cfg 'gen_id' option to use the 'etc/' namespace Date: Mon, 15 Jun 2020 12:34:55 +0200 Message-Id: <20200615103457.25282-4-philmd@redhat.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200615103457.25282-1-philmd@redhat.com> References: <20200615103457.25282-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=207.211.31.81; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/15 01:43:27 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Laszlo Ersek , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Names of user-provided fw_cfg items are supposed to start with "opt/". However FW_CFG_DATA_GENERATOR items are generated by QEMU, so allow the "etc/" namespace in this specific case. Reviewed-by: Laszlo Ersek Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- docs/specs/fw_cfg.txt | 4 ++++ softmmu/vl.c | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/docs/specs/fw_cfg.txt b/docs/specs/fw_cfg.txt index bc16daa38a..3e6d586f66 100644 --- a/docs/specs/fw_cfg.txt +++ b/docs/specs/fw_cfg.txt @@ -258,4 +258,8 @@ Prefix "opt/org.qemu/" is reserved for QEMU itself. Use of names not beginning with "opt/" is potentially dangerous and entirely unsupported. QEMU will warn if you try. =20 +Use of names not beginning with "opt/" is tolerated with 'gen_id' (that +is, the warning is suppressed), but you must know exactly what you're +doing. + All externally provided fw_cfg items are read-only to the guest. diff --git a/softmmu/vl.c b/softmmu/vl.c index a46fe5c6c9..535f9d4f24 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -2049,7 +2049,13 @@ static int parse_fw_cfg(void *opaque, QemuOpts *opts= , Error **errp) FW_CFG_MAX_FILE_PATH - 1); return -1; } - if (strncmp(name, "opt/", 4) !=3D 0) { + if (nonempty_str(gen_id)) { + /* + * In this particular case where the content is populated + * internally, the "etc/" namespace protection is relaxed, + * so do not emit a warning. + */ + } else if (strncmp(name, "opt/", 4) !=3D 0) { warn_report("externally provided fw_cfg item names " "should be prefixed with \"opt/\""); } --=20 2.21.3 From nobody Sun Feb 8 16:19:15 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 ARC-Seal: i=1; a=rsa-sha256; t=1592217419; cv=none; d=zohomail.com; s=zohoarc; b=JSrQLwLeEWE2dCjsRvRBnsVZqi3MG8NjaMjfKODoCyztS078hbluMxo0KavUf1OSo4sJ1QzogqyMyC9yp1obT8WgiwPSnqC2Pb49gXnH3UjZmMaaZylfmPItFF9mSqfTF0/zhilvobIndmpoR+gNHT9t6YcN9QybclUlMtemH5M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592217419; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=P2//2J4H18E/Fi9e7Kie/K1mKXAE8svQXRc0XTzmRGE=; b=GqlwCG7NZskSOQSLp06fCEjFQVTu3G6fK9+CjYRPkxyfSl+SbFDpbPKGNEOXwsWCW9vMcJdioCHRuvHs6eyXWu/yfhR5Qb9vnZ1Uo5Um1yz2PbOPTZDRVCYccC0EnihBRHLor556tzyNKxh/3prG5ZU7bl8kI4Ug++bv37Zhcv0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1592217419519554.3187028456309; Mon, 15 Jun 2020 03:36:59 -0700 (PDT) Received: from localhost ([::1]:52066 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jkmU6-0000To-5o for importer@patchew.org; Mon, 15 Jun 2020 06:36:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52282) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jkmSr-0007X3-5I for qemu-devel@nongnu.org; Mon, 15 Jun 2020 06:35:41 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:34393 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jkmSo-0007Gv-JU for qemu-devel@nongnu.org; Mon, 15 Jun 2020 06:35:40 -0400 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-213-FEsw12HoPbaY3v-HebGhWw-1; Mon, 15 Jun 2020 06:35:32 -0400 Received: by mail-wm1-f72.google.com with SMTP id b63so5895916wme.1 for ; Mon, 15 Jun 2020 03:35:31 -0700 (PDT) Received: from localhost.localdomain (181.red-88-10-103.dynamicip.rima-tde.net. [88.10.103.181]) by smtp.gmail.com with ESMTPSA id d191sm22637198wmd.44.2020.06.15.03.35.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jun 2020 03:35:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592217337; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=P2//2J4H18E/Fi9e7Kie/K1mKXAE8svQXRc0XTzmRGE=; b=PZKjiRNTuwjBCZQcmDrLv8XshcT5bnnaeeaTsH1KOd6etCe8VLfQukgNw0fPe4tLv+ugZh ahFQeH9fMjV+yeFUGo/Z6limb7YBelr3wBF9XWEcVMyKDNSgPrHTezIx+dBKULVpTDEt42 IKA2Xwx5erx2IT2wo/1Ug6xzNpmWEZo= X-MC-Unique: FEsw12HoPbaY3v-HebGhWw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=P2//2J4H18E/Fi9e7Kie/K1mKXAE8svQXRc0XTzmRGE=; b=XMAEjO/mw4HXSriAHxEpMwq1Vyqm7ICldLmSWQEozRm0PqmMqYEmcmAbMg8Xy/49Gy 0hGHAny4xXWwhhcJTnMKqgrl6UoNKTkafl0991o7KrNGthi4PKHM5QfQKxAR1b7cTt2h jhUM3wKSkG/GFoXvbZ235eqtnzU9BCmrtD3c1id+5Q0V8Zx+ej+NVumvr5LK7vvubb4R sNa/xOkJtgtrO6OcG5EumJRQl+nG6D5kPESQ4GzexcXdTgmBgnBqP8u2gCBp0DljT2PY sMIo7jw8eRW2CmThz/S3yjIGUdlG2aRwfoQkwX+WQ1SkCc9kb5B0DCXcjowjsln7UR5v oreA== X-Gm-Message-State: AOAM531tAA99gIS9pLROPvJ5TnQGYBfOue/Qrpe/fjq2qMWwdEZdEeW7 U4XmU9QwbNCBQOXv22+2LkwC20w2XAfIj3NGBxbTEfGv1PesfYy71R304kq2woMHiCF6mkcVt9m UsBFdghRdmFvgVnA= X-Received: by 2002:adf:edc8:: with SMTP id v8mr27136185wro.176.1592217330437; Mon, 15 Jun 2020 03:35:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz9xrdM2nDQpdmaxcd96et9ePkx1P+V6+Vkg+F8tyjz1eZVMGSI97gDbnHT/ErJEg88VB9Xwg== X-Received: by 2002:adf:edc8:: with SMTP id v8mr27136150wro.176.1592217329951; Mon, 15 Jun 2020 03:35:29 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Gerd Hoffmann Subject: [PATCH v9 4/5] crypto: Add tls-cipher-suites object Date: Mon, 15 Jun 2020 12:34:56 +0200 Message-Id: <20200615103457.25282-5-philmd@redhat.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200615103457.25282-1-philmd@redhat.com> References: <20200615103457.25282-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=207.211.31.81; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/15 01:43:27 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Laszlo Ersek , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) On the host OS, various aspects of TLS operation are configurable. In particular it is possible for the sysadmin to control the TLS cipher/protocol algorithms that applications are permitted to use. * Any given crypto library has a built-in default priority list defined by the distro maintainer of the library package (or by upstream). * The "crypto-policies" RPM (or equivalent host OS package) provides a config file such as "/etc/crypto-policies/config", where the sysadmin can set a high level (library-independent) policy. The "update-crypto-policies --set" command (or equivalent) is used to translate the global policy to individual library representations, producing files such as "/etc/crypto-policies/back-ends/*.config". The generated files, if present, are loaded by the various crypto libraries to override their own built-in defaults. For example, the GNUTLS library may read "/etc/crypto-policies/back-ends/gnutls.config". * A management application (or the QEMU user) may overide the system-wide crypto-policies config via their own config, if they need to diverge from the former. Thus the priority order is "QEMU user config" > "crypto-policies system config" > "library built-in config". Introduce the "tls-cipher-suites" object for exposing the ordered list of permitted TLS cipher suites from the host side to the guest firmware, via fw_cfg. The list is represented as an array of IANA_TLS_CIPHER objects. The firmware uses the IANA_TLS_CIPHER array for configuring guest-side TLS, for example in UEFI HTTPS Boot. The priority at which the host-side policy is retrieved is given by the "priority" property of the new object type. For example, "priority=3D@SYSTEM" may be used to refer to "/etc/crypto-policies/back-ends/gnutls.config" (given that QEMU uses GNUTLS). [Description from Daniel P. Berrang=C3=A9, edited by Laszlo Ersek.] Example of use to dump the cipher suites: $ qemu-system-x86_64 -S \ -object tls-cipher-suites,id=3Dmysuite,priority=3D@SYSTEM \ -trace qcrypto\* 1590664444.197123:qcrypto_tls_cipher_suite_priority priority: @SYSTEM 1590664444.197219:qcrypto_tls_cipher_suite_info data=3D[0x13,0x02] versio= n=3DTLS1.3 name=3DTLS_AES_256_GCM_SHA384 1590664444.197228:qcrypto_tls_cipher_suite_info data=3D[0x13,0x03] versio= n=3DTLS1.3 name=3DTLS_CHACHA20_POLY1305_SHA256 1590664444.197233:qcrypto_tls_cipher_suite_info data=3D[0x13,0x01] versio= n=3DTLS1.3 name=3DTLS_AES_128_GCM_SHA256 1590664444.197236:qcrypto_tls_cipher_suite_info data=3D[0x13,0x04] versio= n=3DTLS1.3 name=3DTLS_AES_128_CCM_SHA256 1590664444.197240:qcrypto_tls_cipher_suite_info data=3D[0xc0,0x30] versio= n=3DTLS1.2 name=3DTLS_ECDHE_RSA_AES_256_GCM_SHA384 1590664444.197245:qcrypto_tls_cipher_suite_info data=3D[0xcc,0xa8] versio= n=3DTLS1.2 name=3DTLS_ECDHE_RSA_CHACHA20_POLY1305 1590664444.197250:qcrypto_tls_cipher_suite_info data=3D[0xc0,0x14] versio= n=3DTLS1.0 name=3DTLS_ECDHE_RSA_AES_256_CBC_SHA1 1590664444.197254:qcrypto_tls_cipher_suite_info data=3D[0xc0,0x2f] versio= n=3DTLS1.2 name=3DTLS_ECDHE_RSA_AES_128_GCM_SHA256 1590664444.197258:qcrypto_tls_cipher_suite_info data=3D[0xc0,0x13] versio= n=3DTLS1.0 name=3DTLS_ECDHE_RSA_AES_128_CBC_SHA1 1590664444.197261:qcrypto_tls_cipher_suite_info data=3D[0xc0,0x2c] versio= n=3DTLS1.2 name=3DTLS_ECDHE_ECDSA_AES_256_GCM_SHA384 1590664444.197266:qcrypto_tls_cipher_suite_info data=3D[0xcc,0xa9] versio= n=3DTLS1.2 name=3DTLS_ECDHE_ECDSA_CHACHA20_POLY1305 1590664444.197270:qcrypto_tls_cipher_suite_info data=3D[0xc0,0xad] versio= n=3DTLS1.2 name=3DTLS_ECDHE_ECDSA_AES_256_CCM 1590664444.197274:qcrypto_tls_cipher_suite_info data=3D[0xc0,0x0a] versio= n=3DTLS1.0 name=3DTLS_ECDHE_ECDSA_AES_256_CBC_SHA1 1590664444.197278:qcrypto_tls_cipher_suite_info data=3D[0xc0,0x2b] versio= n=3DTLS1.2 name=3DTLS_ECDHE_ECDSA_AES_128_GCM_SHA256 1590664444.197283:qcrypto_tls_cipher_suite_info data=3D[0xc0,0xac] versio= n=3DTLS1.2 name=3DTLS_ECDHE_ECDSA_AES_128_CCM 1590664444.197287:qcrypto_tls_cipher_suite_info data=3D[0xc0,0x09] versio= n=3DTLS1.0 name=3DTLS_ECDHE_ECDSA_AES_128_CBC_SHA1 1590664444.197291:qcrypto_tls_cipher_suite_info data=3D[0x00,0x9d] versio= n=3DTLS1.2 name=3DTLS_RSA_AES_256_GCM_SHA384 1590664444.197296:qcrypto_tls_cipher_suite_info data=3D[0xc0,0x9d] versio= n=3DTLS1.2 name=3DTLS_RSA_AES_256_CCM 1590664444.197300:qcrypto_tls_cipher_suite_info data=3D[0x00,0x35] versio= n=3DTLS1.0 name=3DTLS_RSA_AES_256_CBC_SHA1 1590664444.197304:qcrypto_tls_cipher_suite_info data=3D[0x00,0x9c] versio= n=3DTLS1.2 name=3DTLS_RSA_AES_128_GCM_SHA256 1590664444.197308:qcrypto_tls_cipher_suite_info data=3D[0xc0,0x9c] versio= n=3DTLS1.2 name=3DTLS_RSA_AES_128_CCM 1590664444.197312:qcrypto_tls_cipher_suite_info data=3D[0x00,0x2f] versio= n=3DTLS1.0 name=3DTLS_RSA_AES_128_CBC_SHA1 1590664444.197316:qcrypto_tls_cipher_suite_info data=3D[0x00,0x9f] versio= n=3DTLS1.2 name=3DTLS_DHE_RSA_AES_256_GCM_SHA384 1590664444.197320:qcrypto_tls_cipher_suite_info data=3D[0xcc,0xaa] versio= n=3DTLS1.2 name=3DTLS_DHE_RSA_CHACHA20_POLY1305 1590664444.197325:qcrypto_tls_cipher_suite_info data=3D[0xc0,0x9f] versio= n=3DTLS1.2 name=3DTLS_DHE_RSA_AES_256_CCM 1590664444.197329:qcrypto_tls_cipher_suite_info data=3D[0x00,0x39] versio= n=3DTLS1.0 name=3DTLS_DHE_RSA_AES_256_CBC_SHA1 1590664444.197333:qcrypto_tls_cipher_suite_info data=3D[0x00,0x9e] versio= n=3DTLS1.2 name=3DTLS_DHE_RSA_AES_128_GCM_SHA256 1590664444.197337:qcrypto_tls_cipher_suite_info data=3D[0xc0,0x9e] versio= n=3DTLS1.2 name=3DTLS_DHE_RSA_AES_128_CCM 1590664444.197341:qcrypto_tls_cipher_suite_info data=3D[0x00,0x33] versio= n=3DTLS1.0 name=3DTLS_DHE_RSA_AES_128_CBC_SHA1 1590664444.197345:qcrypto_tls_cipher_suite_count count: 29 Reviewed-by: Laszlo Ersek Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- v9: Replaced 'backends' -> 'frontends' (lersek) --- include/crypto/tls-cipher-suites.h | 38 +++++++++ crypto/tls-cipher-suites.c | 127 +++++++++++++++++++++++++++++ crypto/Makefile.objs | 1 + crypto/trace-events | 5 ++ qemu-options.hx | 19 +++++ 5 files changed, 190 insertions(+) create mode 100644 include/crypto/tls-cipher-suites.h create mode 100644 crypto/tls-cipher-suites.c diff --git a/include/crypto/tls-cipher-suites.h b/include/crypto/tls-cipher= -suites.h new file mode 100644 index 0000000000..3848393a20 --- /dev/null +++ b/include/crypto/tls-cipher-suites.h @@ -0,0 +1,38 @@ +/* + * QEMU TLS Cipher Suites Registry (RFC8447) + * + * Copyright (c) 2019 Red Hat, Inc. + * + * Author: Philippe Mathieu-Daud=C3=A9 + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#ifndef QCRYPTO_TLSCIPHERSUITES_H +#define QCRYPTO_TLSCIPHERSUITES_H + +#include "qom/object.h" +#include "crypto/tlscreds.h" + +#define TYPE_QCRYPTO_TLS_CIPHER_SUITES "tls-cipher-suites" +#define QCRYPTO_TLS_CIPHER_SUITES(obj) \ + OBJECT_CHECK(QCryptoTLSCipherSuites, (obj), TYPE_QCRYPTO_TLS_CIPHER_SU= ITES) + +/* + * IANA registered TLS ciphers: + * https://www.iana.org/assignments/tls-parameters/tls-parameters.xhtml#tl= s-parameters-4 + */ +typedef struct { + uint8_t data[2]; +} QEMU_PACKED IANA_TLS_CIPHER; + +typedef struct QCryptoTLSCipherSuites { + /* */ + QCryptoTLSCreds parent_obj; + + /* */ + IANA_TLS_CIPHER *cipher_list; + unsigned cipher_count; +} QCryptoTLSCipherSuites; + +#endif /* QCRYPTO_TLSCIPHERSUITES_H */ diff --git a/crypto/tls-cipher-suites.c b/crypto/tls-cipher-suites.c new file mode 100644 index 0000000000..f02a041f9a --- /dev/null +++ b/crypto/tls-cipher-suites.c @@ -0,0 +1,127 @@ +/* + * QEMU TLS Cipher Suites + * + * Copyright (c) 2019 Red Hat, Inc. + * + * Author: Philippe Mathieu-Daud=C3=A9 + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "qom/object_interfaces.h" +#include "qemu/error-report.h" +#include "crypto/tlscreds.h" +#include "crypto/tls-cipher-suites.h" +#include "trace.h" + +static void parse_cipher_suites(QCryptoTLSCipherSuites *s, + const char *priority_name, Error **errp) +{ + int ret; + const char *err; + gnutls_priority_t pcache; + enum { M_ENUMERATE, M_GENERATE, M_DONE } mode; + + assert(priority_name); + trace_qcrypto_tls_cipher_suite_priority(priority_name); + ret =3D gnutls_priority_init(&pcache, priority_name, &err); + if (ret < 0) { + error_setg(errp, "Syntax error using priority '%s': %s", + priority_name, gnutls_strerror(ret)); + return; + } + + for (mode =3D M_ENUMERATE; mode < M_DONE; mode++) { + size_t i; + + for (i =3D 0;; i++) { + int ret; + unsigned idx; + const char *name; + IANA_TLS_CIPHER cipher; + gnutls_protocol_t protocol; + + ret =3D gnutls_priority_get_cipher_suite_index(pcache, i, &idx= ); + if (ret =3D=3D GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE) { + break; + } + if (ret =3D=3D GNUTLS_E_UNKNOWN_CIPHER_SUITE) { + continue; + } + + name =3D gnutls_cipher_suite_info(idx, (unsigned char *)&ciphe= r, + NULL, NULL, NULL, &protocol); + if (name =3D=3D NULL) { + continue; + } + + if (mode =3D=3D M_GENERATE) { + const char *version; + + version =3D gnutls_protocol_get_name(protocol); + trace_qcrypto_tls_cipher_suite_info(cipher.data[0], + cipher.data[1], + version, name); + s->cipher_list[s->cipher_count] =3D cipher; + } + s->cipher_count++; + } + + if (mode =3D=3D M_ENUMERATE) { + if (s->cipher_count =3D=3D 0) { + break; + } + s->cipher_list =3D g_new(IANA_TLS_CIPHER, s->cipher_count); + s->cipher_count =3D 0; + } + } + trace_qcrypto_tls_cipher_suite_count(s->cipher_count); + gnutls_priority_deinit(pcache); +} + +static void qcrypto_tls_cipher_suites_complete(UserCreatable *uc, Error **= errp) +{ + QCryptoTLSCreds *s =3D QCRYPTO_TLS_CREDS(uc); + + if (!s->priority) { + error_setg(errp, "'priority' property is not set"); + return; + } + parse_cipher_suites(QCRYPTO_TLS_CIPHER_SUITES(s), s->priority, errp); +} + +static void qcrypto_tls_cipher_suites_finalize(Object *obj) +{ + QCryptoTLSCipherSuites *s =3D QCRYPTO_TLS_CIPHER_SUITES(obj); + + g_free(s->cipher_list); +} + +static void qcrypto_tls_cipher_suites_class_init(ObjectClass *oc, void *da= ta) +{ + UserCreatableClass *ucc =3D USER_CREATABLE_CLASS(oc); + + ucc->complete =3D qcrypto_tls_cipher_suites_complete; +} + +static const TypeInfo qcrypto_tls_cipher_suites_info =3D { + .parent =3D TYPE_QCRYPTO_TLS_CREDS, + .name =3D TYPE_QCRYPTO_TLS_CIPHER_SUITES, + .instance_size =3D sizeof(QCryptoTLSCipherSuites), + .instance_finalize =3D qcrypto_tls_cipher_suites_finalize, + .class_size =3D sizeof(QCryptoTLSCredsClass), + .class_init =3D qcrypto_tls_cipher_suites_class_init, + .interfaces =3D (InterfaceInfo[]) { + { TYPE_USER_CREATABLE }, + { } + } +}; + +static void qcrypto_tls_cipher_suites_register_types(void) +{ + type_register_static(&qcrypto_tls_cipher_suites_info); +} + +type_init(qcrypto_tls_cipher_suites_register_types); diff --git a/crypto/Makefile.objs b/crypto/Makefile.objs index c2a371b0b4..1c1b5e21ff 100644 --- a/crypto/Makefile.objs +++ b/crypto/Makefile.objs @@ -13,6 +13,7 @@ crypto-obj-y +=3D cipher.o crypto-obj-$(CONFIG_AF_ALG) +=3D afalg.o crypto-obj-$(CONFIG_AF_ALG) +=3D cipher-afalg.o crypto-obj-$(CONFIG_AF_ALG) +=3D hash-afalg.o +crypto-obj-$(CONFIG_GNUTLS) +=3D tls-cipher-suites.o crypto-obj-y +=3D tlscreds.o crypto-obj-y +=3D tlscredsanon.o crypto-obj-y +=3D tlscredspsk.o diff --git a/crypto/trace-events b/crypto/trace-events index 9e594d30e8..798b6067ab 100644 --- a/crypto/trace-events +++ b/crypto/trace-events @@ -21,3 +21,8 @@ qcrypto_tls_creds_x509_load_cert_list(void *creds, const = char *file) "TLS creds # tlssession.c qcrypto_tls_session_new(void *session, void *creds, const char *hostname, = const char *authzid, int endpoint) "TLS session new session=3D%p creds=3D%p= hostname=3D%s authzid=3D%s endpoint=3D%d" qcrypto_tls_session_check_creds(void *session, const char *status) "TLS se= ssion check creds session=3D%p status=3D%s" + +# tls-cipher-suites.c +qcrypto_tls_cipher_suite_priority(const char *name) "priority: %s" +qcrypto_tls_cipher_suite_info(uint8_t data0, uint8_t data1, const char *ve= rsion, const char *name) "data=3D[0x%02x,0x%02x] version=3D%s name=3D%s" +qcrypto_tls_cipher_suite_count(unsigned count) "count: %u" diff --git a/qemu-options.hx b/qemu-options.hx index 93bde2bbc8..4f519f35fd 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -4566,6 +4566,25 @@ SRST string as described at https://gnutls.org/manual/html_node/Priority-Strings.html. =20 + ``-object tls-cipher-suites,id=3Did,priority=3Dpriority`` + Creates a TLS cipher suites object, which can be used to control + the TLS cipher/protocol algorithms that applications are permitted + to use. + + The ``id`` parameter is a unique ID which frontends will use to + access the ordered list of permitted TLS cipher suites from the + host. + + The ``priority`` parameter allows to override the global default + priority used by gnutls. This can be useful if the system + administrator needs to use a weaker set of crypto priorities for + QEMU without potentially forcing the weakness onto all + applications. Or conversely if one wants wants a stronger + default for QEMU than for all other applications, they can do + this through this parameter. Its format is a gnutls priority + string as described at + https://gnutls.org/manual/html_node/Priority-Strings.html. + ``-object filter-buffer,id=3Did,netdev=3Dnetdevid,interval=3Dt[,queue= =3Dall|rx|tx][,status=3Don|off][,position=3Dhead|tail|id=3D][,insert=3D= behind|before]`` Interval t can't be 0, this filter batches the packet delivery: all packets arriving in a given interval on netdev netdevid are --=20 2.21.3 From nobody Sun Feb 8 16:19:15 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 ARC-Seal: i=1; a=rsa-sha256; t=1592217504; cv=none; d=zohomail.com; s=zohoarc; b=D4c1ZgRnUFCoRzU+K1MrqeSv3llWgFWhci3Yu+k3lInb4yE/Dwsmcoe0TDIWd1XJApLqA47+S357yEM4JvbyprEAqhXv8yPxyhjvMv3ZXprgBfLjP69NyZH6iEW5JwDC9UX9MdjKaBl1atrrh2kd0Jbzs0x9xbvQRfv38VNxpPE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592217504; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0TdNeUFrgdnxc067dpUc6dq6R6Ay3YvPU+WKCInzAo4=; b=bTOhTaND1vL/cKU7QhmOmnMbzJpol2bHdQYu/+iIjM8V4IDwkcMBP46L29udNIoAywLP5xvhIBwQplZ6uIuneRd04qC7o3KK3l8KTDJ9OuJXkaTST6FzVYr+lfNweBsH3PxFwhX36wFUhxKrwNanas/j16l3ugHgNnG/Lgn94uU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1592217504721264.5359408167676; Mon, 15 Jun 2020 03:38:24 -0700 (PDT) Received: from localhost ([::1]:59842 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jkmVT-0003if-F9 for importer@patchew.org; Mon, 15 Jun 2020 06:38:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52284) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jkmSr-0007YK-Jd for qemu-devel@nongnu.org; Mon, 15 Jun 2020 06:35:41 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:42247 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jkmSp-0007H1-Mg for qemu-devel@nongnu.org; Mon, 15 Jun 2020 06:35:41 -0400 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-186-i8EHCIVxPt22uH0Znctgxg-1; Mon, 15 Jun 2020 06:35:37 -0400 Received: by mail-wm1-f71.google.com with SMTP id p24so6515846wmc.1 for ; Mon, 15 Jun 2020 03:35:36 -0700 (PDT) Received: from localhost.localdomain (181.red-88-10-103.dynamicip.rima-tde.net. [88.10.103.181]) by smtp.gmail.com with ESMTPSA id y5sm24794213wrs.63.2020.06.15.03.35.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jun 2020 03:35:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592217338; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0TdNeUFrgdnxc067dpUc6dq6R6Ay3YvPU+WKCInzAo4=; b=JvTMiMIzOQ0Lwz/GHag/iWdfPjupNxwM/eLaYq1p43OMTyEdnxSwIv6BjVb+BySjTn8b9Y MBwg9AWnM3QOdp9wN8MTstktQOI5SyQXhYQyEJqyvWW8WOCa0JbsqA7EJK70z8nuGC2QWL nOKudgmGZv2NX2jKCYuhIuGT0mVpkQM= X-MC-Unique: i8EHCIVxPt22uH0Znctgxg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0TdNeUFrgdnxc067dpUc6dq6R6Ay3YvPU+WKCInzAo4=; b=Ya+9uvdPIIvzKf/IPjLRVIM6Z7taWWrni2vvIKnVt9Fk7HRy9d+vhE9ilJJ14zBsFq /zaIRSN3UfJ+M+Wfz7v2e/wGEOXC9dTJC8J4kSFwnC4bMNkT7+blprAnHOGjPObapfDZ cIXojYnmUcyqkLeV9nAlvvSmAPU4F6/MOzZa/l03dhM7kZ4QqZCWYSRIe4Ur04WG7hd0 VqRG39C1/SEsecwV78lizS14eH1QNzVj09qgHkNyq+WHwZ/vW6Wi6JB3UNyUd+Iwhb3d 6RlZG7Tzw8pbht6lRyCj9JeGyhASDIFsPF7VF8Uytvb0GBvv1PGpMkf51m0+1kbBTEJD sqXw== X-Gm-Message-State: AOAM5320zC0mO1riMxJclVpRfotogZvTskYefXhFOhlpsZPc2nNlYWxp KdR8kWdhxU3Jifl09Fty20apg8fL2psehZ6/uMjuVrbcnsKvEF4wN9vXJiD3zVfA0LG4V6Qwd8g 1SJn+04LvrD1T/ws= X-Received: by 2002:a05:6000:120b:: with SMTP id e11mr28312335wrx.107.1592217335604; Mon, 15 Jun 2020 03:35:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz635h8fZF/aEc9mIj2mUzTOHcb6Kll2rIgjSg+sygCRyo2m9t/m62wol35ZR0PjIRj5KhHJA== X-Received: by 2002:a05:6000:120b:: with SMTP id e11mr28312319wrx.107.1592217335358; Mon, 15 Jun 2020 03:35:35 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Gerd Hoffmann Subject: [PATCH v9 5/5] crypto/tls-cipher-suites: Produce fw_cfg consumable blob Date: Mon, 15 Jun 2020 12:34:57 +0200 Message-Id: <20200615103457.25282-6-philmd@redhat.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200615103457.25282-1-philmd@redhat.com> References: <20200615103457.25282-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=205.139.110.61; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/15 01:12:36 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Laszlo Ersek , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Since our format is consumable by the fw_cfg device, we can implement the FW_CFG_DATA_GENERATOR interface. Acked-by: Laszlo Ersek Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- v9: Fixed typos in qemu-options.hx (lersek) --- crypto/tls-cipher-suites.c | 19 +++++++++++++++++++ qemu-options.hx | 18 ++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/crypto/tls-cipher-suites.c b/crypto/tls-cipher-suites.c index f02a041f9a..d6ea0ed190 100644 --- a/crypto/tls-cipher-suites.c +++ b/crypto/tls-cipher-suites.c @@ -14,6 +14,7 @@ #include "qemu/error-report.h" #include "crypto/tlscreds.h" #include "crypto/tls-cipher-suites.h" +#include "hw/nvram/fw_cfg.h" #include "trace.h" =20 static void parse_cipher_suites(QCryptoTLSCipherSuites *s, @@ -99,11 +100,28 @@ static void qcrypto_tls_cipher_suites_finalize(Object = *obj) g_free(s->cipher_list); } =20 +static const void *qcrypto_tls_cipher_suites_get_data(Object *obj) +{ + QCryptoTLSCipherSuites *s =3D QCRYPTO_TLS_CIPHER_SUITES(obj); + + return s->cipher_list; +} + +static size_t qcrypto_tls_cipher_suites_get_length(Object *obj) +{ + QCryptoTLSCipherSuites *s =3D QCRYPTO_TLS_CIPHER_SUITES(obj); + + return s->cipher_count * sizeof(IANA_TLS_CIPHER); +} + static void qcrypto_tls_cipher_suites_class_init(ObjectClass *oc, void *da= ta) { UserCreatableClass *ucc =3D USER_CREATABLE_CLASS(oc); + FWCfgDataGeneratorClass *fwgc =3D FW_CFG_DATA_GENERATOR_CLASS(oc); =20 ucc->complete =3D qcrypto_tls_cipher_suites_complete; + fwgc->get_data =3D qcrypto_tls_cipher_suites_get_data; + fwgc->get_length =3D qcrypto_tls_cipher_suites_get_length; } =20 static const TypeInfo qcrypto_tls_cipher_suites_info =3D { @@ -115,6 +133,7 @@ static const TypeInfo qcrypto_tls_cipher_suites_info = =3D { .class_init =3D qcrypto_tls_cipher_suites_class_init, .interfaces =3D (InterfaceInfo[]) { { TYPE_USER_CREATABLE }, + { TYPE_FW_CFG_DATA_GENERATOR_INTERFACE }, { } } }; diff --git a/qemu-options.hx b/qemu-options.hx index 4f519f35fd..ce54c7359c 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -4585,6 +4585,24 @@ SRST string as described at https://gnutls.org/manual/html_node/Priority-Strings.html. =20 + An example of use of this object is to control UEFI HTTPS Boot. + The tls-cipher-suites object exposes the ordered list of permitted + TLS cipher suites from the host side to the guest firmware, via + fw_cfg. The list is represented as an array of IANA_TLS_CIPHER + objects. The firmware uses the IANA_TLS_CIPHER array for configuri= ng + guest-side TLS. + + In the following example, the priority at which the host-side poli= cy + is retrieved is given by the ``priority`` property. + Given that QEMU uses GNUTLS, ``priority=3D@SYSTEM`` may be used to + refer to /etc/crypto-policies/back-ends/gnutls.config. + + .. parsed-literal:: + + # |qemu_system| \ + -object tls-cipher-suites,id=3Dmysuite0,priority=3D@SYSTE= M \ + -fw_cfg name=3Detc/edk2/https/ciphers,gen_id=3Dmysuite0 + ``-object filter-buffer,id=3Did,netdev=3Dnetdevid,interval=3Dt[,queue= =3Dall|rx|tx][,status=3Don|off][,position=3Dhead|tail|id=3D][,insert=3D= behind|before]`` Interval t can't be 0, this filter batches the packet delivery: all packets arriving in a given interval on netdev netdevid are --=20 2.21.3