From nobody Sat May 18 10:07:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass header.i=dpsmith@apertussolutions.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=apertussolutions.com) ARC-Seal: i=2; a=rsa-sha256; t=1654009875; cv=pass; d=zohomail.com; s=zohoarc; b=S3DVB4dwyYtjFNTjCWrU7+vidYcM0WdpQPlOfFfc7O+rfpRjPZ2psQyPSsGqhifMrTGjbiic6Ad6F7hQnLIqF4CwAlqpkrFYcVC0vRhZnsH2L9/XiltXleYJk+moV1Vo3kdDEiZCSsA0Idr988pC8mjiR10od9b0/0FqAVMOjwQ= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1654009875; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0S5/4L9LbrEvX7ep2X/hy4hvb0TSeot95E50192YMEs=; b=K5yQ70roAIxn2ZSq7ZYW61UpeRgos35u6C5k0qLj3jR8sxwK3nuzjXKwqIRhWaeYo/9pgW9M2b1/tUFgPMKmIP/sPzvRkqGRYysDM9synZSGTRfNGseUXdujtMDxuAu4GmeNYVv8r3xwFViVzsjoeWipEMbAhQBB4Wcih2lnv2A= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass header.i=dpsmith@apertussolutions.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=apertussolutions.com) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1654009875928839.6851963929684; Tue, 31 May 2022 08:11:15 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.339745.564646 (Exim 4.92) (envelope-from ) id 1nw3W7-00032J-G4; Tue, 31 May 2022 15:10:43 +0000 Received: by outflank-mailman (output) from mailman id 339745.564646; Tue, 31 May 2022 15:10:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1nw3W7-00032C-Bx; Tue, 31 May 2022 15:10:43 +0000 Received: by outflank-mailman (input) for mailman id 339745; Tue, 31 May 2022 15:10:42 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1nw3W6-0002ll-0k for xen-devel@lists.xenproject.org; Tue, 31 May 2022 15:10:42 +0000 Received: from sender4-of-o51.zoho.com (sender4-of-o51.zoho.com [136.143.188.51]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id d4fbaa28-e0f3-11ec-bd2c-47488cf2e6aa; Tue, 31 May 2022 17:10:41 +0200 (CEST) Received: from sisyou.hme. (static-72-81-132-2.bltmmd.fios.verizon.net [72.81.132.2]) by mx.zohomail.com with SMTPS id 1654009832776172.65391536782158; Tue, 31 May 2022 08:10:32 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: d4fbaa28-e0f3-11ec-bd2c-47488cf2e6aa ARC-Seal: i=1; a=rsa-sha256; t=1654009834; cv=none; d=zohomail.com; s=zohoarc; b=IKFkJUdxPRhapDkL3848JX6fvYi2lANC/kjZygZZbyt3Jsvbam5CkaZXE8UZ/NZVQNYoTpS8DAkUBtghJ6mcPC3IRXQOqt47swjFCxvSnnlbEol2B4Ku5k19a3NY2rUI+NPMCY7KE9lcXbGnmVWfCJ1VABS99f/Oo9CfhFSBB/A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1654009834; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=0S5/4L9LbrEvX7ep2X/hy4hvb0TSeot95E50192YMEs=; b=JxbH0x8jZ/EDew1BDsgDR+cUXW4vd81e1D2i4ivw3aslxcBXNXxnjv/gGePNTDnWx13ztBswJT1L9ms4IVae99LpdGDEdq8Ca3zRQtls9fBjOx2TaidBVUrE+sYnLvI3tXf894d5w8/uudV9l/lL70+YFqvRCjc+c4caKyiWgnE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=apertussolutions.com; spf=pass smtp.mailfrom=dpsmith@apertussolutions.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1654009834; s=zoho; d=apertussolutions.com; i=dpsmith@apertussolutions.com; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-Id:Message-Id:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding:Reply-To; bh=0S5/4L9LbrEvX7ep2X/hy4hvb0TSeot95E50192YMEs=; b=nnBATZCIBsfNMYD6Xw7PiEbTp5wCQjcnYXNcZGYwh0MoR7z/3koE2zIyPOduOxyN gSLmdpFmdaXJSzcWnyL3QNaz2xzGMCvysjM6FEkZdPUT05E+g3Lj1UdT3wYX3iWDDS3 2noTfvixdBG0cv0ip2nl3NPY6b7JS691C2WNOqfg= From: "Daniel P. Smith" To: xen-devel@lists.xenproject.org, "Daniel P. Smith" Cc: scott.davis@starlab.io, christopher.clark@starlab.io, jandryuk@gmail.com, Daniel De Graaf Subject: [PATCH v3 1/3] xsm: only search for a policy file when needed Date: Tue, 31 May 2022 11:08:55 -0400 Message-Id: <20220531150857.19727-2-dpsmith@apertussolutions.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220531150857.19727-1-dpsmith@apertussolutions.com> References: <20220531150857.19727-1-dpsmith@apertussolutions.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMailClient: External X-ZohoMail-DKIM: pass (identity dpsmith@apertussolutions.com) X-ZM-MESSAGEID: 1654009876641100002 Content-Type: text/plain; charset="utf-8" It is possible to select a few different build configurations that results = in the unnecessary walking of the boot module list looking for a policy module. This specifically occurs when the flask policy is enabled but either the du= mmy or the SILO policy is selected as the enforcing policy. This is not ideal f= or configurations like hyperlaunch and dom0less when there could be a number of modules to be walked or doing an unnecessary device tree lookup. This patch introduces the policy_file_required flag for tracking when an XSM policy module requires a policy file. Only when the policy_file_required fl= ag is set to true, will XSM search the boot modules for a policy file. Signed-off-by: Daniel P. Smith Reviewed-by: Jan Beulich --- xen/xsm/xsm_core.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/xen/xsm/xsm_core.c b/xen/xsm/xsm_core.c index 2286a502e3..4a29ee9558 100644 --- a/xen/xsm/xsm_core.c +++ b/xen/xsm/xsm_core.c @@ -55,19 +55,31 @@ static enum xsm_bootparam __initdata xsm_bootparam =3D XSM_BOOTPARAM_DUMMY; #endif =20 +static bool __initdata policy_file_required =3D + IS_ENABLED(CONFIG_XSM_FLASK_DEFAULT); + static int __init cf_check parse_xsm_param(const char *s) { int rc =3D 0; =20 if ( !strcmp(s, "dummy") ) + { xsm_bootparam =3D XSM_BOOTPARAM_DUMMY; + policy_file_required =3D false; + } #ifdef CONFIG_XSM_FLASK else if ( !strcmp(s, "flask") ) + { xsm_bootparam =3D XSM_BOOTPARAM_FLASK; + policy_file_required =3D true; + } #endif #ifdef CONFIG_XSM_SILO else if ( !strcmp(s, "silo") ) + { xsm_bootparam =3D XSM_BOOTPARAM_SILO; + policy_file_required =3D false; + } #endif else rc =3D -EINVAL; @@ -148,7 +160,7 @@ int __init xsm_multiboot_init( =20 printk("XSM Framework v" XSM_FRAMEWORK_VERSION " initialized\n"); =20 - if ( XSM_MAGIC ) + if ( policy_file_required && XSM_MAGIC ) { ret =3D xsm_multiboot_policy_init(module_map, mbi, &policy_buffer, &policy_size); @@ -176,7 +188,7 @@ int __init xsm_dt_init(void) =20 printk("XSM Framework v" XSM_FRAMEWORK_VERSION " initialized\n"); =20 - if ( XSM_MAGIC ) + if ( policy_file_required && XSM_MAGIC ) { ret =3D xsm_dt_policy_init(&policy_buffer, &policy_size); if ( ret ) --=20 2.20.1 From nobody Sat May 18 10:07:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass header.i=dpsmith@apertussolutions.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=apertussolutions.com) ARC-Seal: i=2; a=rsa-sha256; t=1654009894; cv=pass; d=zohomail.com; s=zohoarc; b=YhV1zslL0BaL63ZL3sNLdWpf2hWDwSjlu3xBJGUlyU6mDM4/hyfzYAZqd0GRqunky+onp1jsCsXux96nTcyBScFtYMHMawodpVnPxfsUBZluLAFkXQDTDAiurjz1Z9AoERV9abt9lTLetALPx+TIDH/0MlkHZpnlggVPmmPin2s= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1654009894; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Sjrnmu86gujeudz33+MAWmkOkhEiPemzBi/wKxHuwM0=; b=B99kOxGwu7+nRKuphieFxGIffU6TY0allyYVyvytjjNYLlZRWOOfZrl4/jdcGj7vWtonfwccvcvVR+k0GhLSMmiheVtlp+PdjxVylfjmqdr2wR7MoMAAAVZnRdhD/DYsP0hhEV0VA6owBCHlmz5QkLPJ6U4cXPJUZ2dx15+y9lo= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass header.i=dpsmith@apertussolutions.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=apertussolutions.com) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 16540098945213.7710073344269404; Tue, 31 May 2022 08:11:34 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.339753.564657 (Exim 4.92) (envelope-from ) id 1nw3WO-0003bY-U4; Tue, 31 May 2022 15:11:00 +0000 Received: by outflank-mailman (output) from mailman id 339753.564657; Tue, 31 May 2022 15:11:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1nw3WO-0003bN-RF; Tue, 31 May 2022 15:11:00 +0000 Received: by outflank-mailman (input) for mailman id 339753; Tue, 31 May 2022 15:10:59 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1nw3WN-0002ll-Bi for xen-devel@lists.xenproject.org; Tue, 31 May 2022 15:10:59 +0000 Received: from sender4-of-o51.zoho.com (sender4-of-o51.zoho.com [136.143.188.51]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id df4f9f20-e0f3-11ec-bd2c-47488cf2e6aa; Tue, 31 May 2022 17:10:58 +0200 (CEST) Received: from sisyou.hme. (static-72-81-132-2.bltmmd.fios.verizon.net [72.81.132.2]) by mx.zohomail.com with SMTPS id 1654009833869201.3186546902441; Tue, 31 May 2022 08:10:33 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: df4f9f20-e0f3-11ec-bd2c-47488cf2e6aa ARC-Seal: i=1; a=rsa-sha256; t=1654009835; cv=none; d=zohomail.com; s=zohoarc; b=SlxY3qGZpKXfT3Nzp4ojdk7Lf7W5tssj1miR6PmyrdOtV02u6EwI5CNgTUIO5q1svC5J7WIHt1tZWCk2z/mtMdPaE3d/lWNTxXP5S4FvQlt+MPCWL3cOjCB9fkKj8r8rZWzxzVeZPM8oh7f5S7sXSa+BMA9i5Af4tlqepDQxE64= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1654009835; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=Sjrnmu86gujeudz33+MAWmkOkhEiPemzBi/wKxHuwM0=; b=BCnuEboAIurMmDpb3680KTHgh1W/xJIHSJ0MjD2Q6IAcZ5sas4e42HFnBTnJYlhwNXXMpeG4NR/1c3FVVTcwFYSjOlAfiAz2PNDyz3Eed8etLhxdVdEA2uHh8iISCidlhptWnmMHr2kdQwMiR4rCrYJJq+UJFFu8onCW1HrgCXc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=apertussolutions.com; spf=pass smtp.mailfrom=dpsmith@apertussolutions.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1654009835; s=zoho; d=apertussolutions.com; i=dpsmith@apertussolutions.com; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-Id:Message-Id:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding:Reply-To; bh=Sjrnmu86gujeudz33+MAWmkOkhEiPemzBi/wKxHuwM0=; b=kcXSqp+zK4RpqFtyfzoigZy03wy7gIPQC6+HgUjpPQMgrhMRBKrtbLmqr4Y/8uy9 TT2HFhqhB04z+Zo+xhIIqjLw6KkVe+iltlktfGkSEFXLdC4sutgT7BAS5LF5LaHbCPK HakTcp4WoZfCjW6aScicE0lJw2sn6s9w5qN+VpEE= From: "Daniel P. Smith" To: xen-devel@lists.xenproject.org, "Daniel P. Smith" Cc: scott.davis@starlab.io, christopher.clark@starlab.io, jandryuk@gmail.com, Daniel De Graaf Subject: [PATCH v3 2/3] xsm: consolidate loading the policy buffer Date: Tue, 31 May 2022 11:08:56 -0400 Message-Id: <20220531150857.19727-3-dpsmith@apertussolutions.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220531150857.19727-1-dpsmith@apertussolutions.com> References: <20220531150857.19727-1-dpsmith@apertussolutions.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMailClient: External X-ZohoMail-DKIM: pass (identity dpsmith@apertussolutions.com) X-ZM-MESSAGEID: 1654009896576100001 Content-Type: text/plain; charset="utf-8" Previously, initializing the policy buffer was split between two functions, xsm_{multiboot,dt}_policy_init() and xsm_core_init(). The latter for loading the policy from boot modules and the former for falling back to built-in po= licy. This patch moves all policy buffer initialization logic under the xsm_{multiboot,dt}_policy_init() functions. It then ensures that an error message is printed for every error condition that may occur in the function= s. With all policy buffer init contained and only called when the policy buffer must be populated, the respective xsm_{mb,dt}_init() functions will panic i= f an error occurs attempting to populate the policy buffer. Signed-off-by: Daniel P. Smith --- xen/include/xsm/xsm.h | 2 +- xen/xsm/xsm_core.c | 18 +++--------------- xen/xsm/xsm_policy.c | 31 +++++++++++++++++++++++++++---- 3 files changed, 31 insertions(+), 20 deletions(-) diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h index 3e2b7fe3db..1676c261c9 100644 --- a/xen/include/xsm/xsm.h +++ b/xen/include/xsm/xsm.h @@ -775,7 +775,7 @@ int xsm_multiboot_init( unsigned long *module_map, const multiboot_info_t *mbi); int xsm_multiboot_policy_init( unsigned long *module_map, const multiboot_info_t *mbi, - void **policy_buffer, size_t *policy_size); + const unsigned char *policy_buffer[], size_t *policy_size); #endif =20 #ifdef CONFIG_HAS_DEVICE_TREE diff --git a/xen/xsm/xsm_core.c b/xen/xsm/xsm_core.c index 4a29ee9558..8f6c3de8a6 100644 --- a/xen/xsm/xsm_core.c +++ b/xen/xsm/xsm_core.c @@ -92,14 +92,6 @@ static int __init xsm_core_init(const void *policy_buffe= r, size_t policy_size) { const struct xsm_ops *ops =3D NULL; =20 -#ifdef CONFIG_XSM_FLASK_POLICY - if ( policy_size =3D=3D 0 ) - { - policy_buffer =3D xsm_flask_init_policy; - policy_size =3D xsm_flask_init_policy_size; - } -#endif - if ( xsm_ops_registered !=3D XSM_OPS_UNREGISTERED ) { printk(XENLOG_ERR @@ -155,7 +147,7 @@ int __init xsm_multiboot_init( unsigned long *module_map, const multiboot_info_t *mbi) { int ret =3D 0; - void *policy_buffer =3D NULL; + const unsigned char *policy_buffer; size_t policy_size =3D 0; =20 printk("XSM Framework v" XSM_FRAMEWORK_VERSION " initialized\n"); @@ -167,8 +159,7 @@ int __init xsm_multiboot_init( if ( ret ) { bootstrap_map(NULL); - printk(XENLOG_ERR "Error %d initializing XSM policy\n", ret); - return -EINVAL; + panic(XENLOG_ERR "Error %d initializing XSM policy\n", ret); } } =20 @@ -192,10 +183,7 @@ int __init xsm_dt_init(void) { ret =3D xsm_dt_policy_init(&policy_buffer, &policy_size); if ( ret ) - { - printk(XENLOG_ERR "Error %d initializing XSM policy\n", ret); - return -EINVAL; - } + panic(XENLOG_ERR "Error %d initializing XSM policy\n", ret); } =20 ret =3D xsm_core_init(policy_buffer, policy_size); diff --git a/xen/xsm/xsm_policy.c b/xen/xsm/xsm_policy.c index 8dafbc9381..6a4f769aec 100644 --- a/xen/xsm/xsm_policy.c +++ b/xen/xsm/xsm_policy.c @@ -8,7 +8,7 @@ * Contributors: * Michael LeMay, * George Coker, - * =20 + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2, * as published by the Free Software Foundation. @@ -32,14 +32,21 @@ #ifdef CONFIG_MULTIBOOT int __init xsm_multiboot_policy_init( unsigned long *module_map, const multiboot_info_t *mbi, - void **policy_buffer, size_t *policy_size) + const unsigned char *policy_buffer[], size_t *policy_size) { int i; module_t *mod =3D (module_t *)__va(mbi->mods_addr); - int rc =3D 0; + int rc =3D -ENOENT; u32 *_policy_start; unsigned long _policy_len; =20 +#ifdef CONFIG_XSM_FLASK_POLICY + /* Initially set to builtin policy, overriden if boot module is found.= */ + *policy_buffer =3D xsm_flask_init_policy; + *policy_size =3D xsm_flask_init_policy_size; + rc =3D 0; +#endif + /* * Try all modules and see whichever could be the binary policy. * Adjust module_map for the module that is the binary policy. @@ -54,13 +61,14 @@ int __init xsm_multiboot_policy_init( =20 if ( (xsm_magic_t)(*_policy_start) =3D=3D XSM_MAGIC ) { - *policy_buffer =3D _policy_start; + *policy_buffer =3D (unsigned char *)_policy_start; *policy_size =3D _policy_len; =20 printk("Policy len %#lx, start at %p.\n", _policy_len,_policy_start); =20 __clear_bit(i, module_map); + rc =3D 0; break; =20 } @@ -68,6 +76,9 @@ int __init xsm_multiboot_policy_init( bootstrap_map(NULL); } =20 + if ( rc =3D=3D -ENOENT ) + printk(XENLOG_ERR "xsm: Unable to locate policy file\n"); + return rc; } #endif @@ -79,7 +90,16 @@ int __init xsm_dt_policy_init(void **policy_buffer, size= _t *policy_size) paddr_t paddr, len; =20 if ( !mod || !mod->size ) + { +#ifdef CONFIG_XSM_FLASK_POLICY + *policy_buffer =3D (void *)xsm_flask_init_policy; + *policy_size =3D xsm_flask_init_policy_size; return 0; +#else + printk(XENLOG_ERR "xsm: Unable to locate policy file\n"); + return -ENOENT; +#endif + } =20 paddr =3D mod->start; len =3D mod->size; @@ -95,7 +115,10 @@ int __init xsm_dt_policy_init(void **policy_buffer, siz= e_t *policy_size) =20 *policy_buffer =3D xmalloc_bytes(len); if ( !*policy_buffer ) + { + printk(XENLOG_ERR "xsm: Unable to allocate memory for XSM policy\n= "); return -ENOMEM; + } =20 copy_from_paddr(*policy_buffer, paddr, len); *policy_size =3D len; --=20 2.20.1 From nobody Sat May 18 10:07:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass header.i=dpsmith@apertussolutions.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=apertussolutions.com) ARC-Seal: i=2; a=rsa-sha256; t=1654009904; cv=pass; d=zohomail.com; s=zohoarc; b=WGdAiVmGZkVm9MWn25izTq3OycgbVG+ePLD3tMWcplkNkt7V3P22nzFcb1wCVPX53o1hO7Mdl4izRBD31SzxXUI+YirhlzkSpRErZCggrAd/9fXl1o0xWf8pjz7GD4DZFvCpyf7YVWI81+kBW2YPkm01AzjHVRuVSOrEZPb4KeE= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1654009904; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=/itM5oH8P546jOtaqfXF7dt1u8YSqmz3yqRhRU6zukM=; b=R09Y5M3IMBFK3yvUWkp8KXtjKU/8EKjaw+uUBqSRsCOahOWfYdVs5EWuWuZ3ohJpeab1pFVy03cEkHT8jKNNLq1D7JSO52ulZtG2s20g8+bH/1TAQ3pwok4WTlZx8omaRd4hJjJqvF8sC/CBBsTVWZ+R3VKGI0ooJbCoGxwcclw= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass header.i=dpsmith@apertussolutions.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=apertussolutions.com) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1654009904561725.7738498199994; Tue, 31 May 2022 08:11:44 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.339756.564668 (Exim 4.92) (envelope-from ) id 1nw3Wa-000444-5c; Tue, 31 May 2022 15:11:12 +0000 Received: by outflank-mailman (output) from mailman id 339756.564668; Tue, 31 May 2022 15:11:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1nw3Wa-00043x-2Y; Tue, 31 May 2022 15:11:12 +0000 Received: by outflank-mailman (input) for mailman id 339756; Tue, 31 May 2022 15:11:10 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1nw3WY-0002ll-34 for xen-devel@lists.xenproject.org; Tue, 31 May 2022 15:11:10 +0000 Received: from sender4-of-o51.zoho.com (sender4-of-o51.zoho.com [136.143.188.51]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id e544f357-e0f3-11ec-bd2c-47488cf2e6aa; Tue, 31 May 2022 17:11:08 +0200 (CEST) Received: from sisyou.hme. (static-72-81-132-2.bltmmd.fios.verizon.net [72.81.132.2]) by mx.zohomail.com with SMTPS id 1654009835556426.3417674232287; Tue, 31 May 2022 08:10:35 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: e544f357-e0f3-11ec-bd2c-47488cf2e6aa ARC-Seal: i=1; a=rsa-sha256; t=1654009838; cv=none; d=zohomail.com; s=zohoarc; b=OJLP+9jHjwII8G59UpMBuxVdvooVsmxuTNH7LC2KmAx0uop8eEVZqSlsKLlUmjh5eWAwYMB7E5mKmx2i9atGSY9fNAqjtMfQN9l1g3eyE3tVRmJk3Syn/kUdEXtaM1FVL/OfBN3WY+hzpoA99PwtYpWBkchsRcqQlG+T8bAemKU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1654009838; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=/itM5oH8P546jOtaqfXF7dt1u8YSqmz3yqRhRU6zukM=; b=F8CzgC5Dtk22p9lDWm9iTY/QcG3gEWSMcPfpCD2yJDLdvw7BfqO2zlPPHq0eefPyTd8/mpWJ3BElyKPkkJrUe4QswUvgRana7vuijqHGnsMdPW2oBAMFMjCSy1P5NrZvA/N3pc/f+szfex7nen/z5oLUb7BP3138GJFmi5ezS2A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=apertussolutions.com; spf=pass smtp.mailfrom=dpsmith@apertussolutions.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1654009838; s=zoho; d=apertussolutions.com; i=dpsmith@apertussolutions.com; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-Id:Message-Id:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding:Reply-To; bh=/itM5oH8P546jOtaqfXF7dt1u8YSqmz3yqRhRU6zukM=; b=KmdbP0tEpFHfezGkght3uPOAZUvNc3z9h4+3GkA0ohhmln8Gl7paPnEzEFr2vLD7 u7reg+w1tHmUAIKxGOlpnfCXlPNAdqwe3+19DNvJXRDoJHIpPTuMOlrX5f7u4ywizkf MauJ279SaiiWVvylqsJgtOsFSEZAdhS3gB7YYyNk= From: "Daniel P. Smith" To: xen-devel@lists.xenproject.org, Volodymyr Babchuk , Wei Liu , "Daniel P. Smith" Cc: scott.davis@starlab.io, christopher.clark@starlab.io, jandryuk@gmail.com, Bertrand Marquis , Stefano Stabellini , Julien Grall , Jan Beulich , Andrew Cooper , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Daniel De Graaf Subject: [PATCH v3 3/3] xsm: properly handle error from XSM init Date: Tue, 31 May 2022 11:08:57 -0400 Message-Id: <20220531150857.19727-4-dpsmith@apertussolutions.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220531150857.19727-1-dpsmith@apertussolutions.com> References: <20220531150857.19727-1-dpsmith@apertussolutions.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMailClient: External X-ZohoMail-DKIM: pass (identity dpsmith@apertussolutions.com) X-ZM-MESSAGEID: 1654009906580100001 Content-Type: text/plain; charset="utf-8" This commit is to move towards providing a uniform interface across architectures to initialize the XSM framework. Specifically, it provides a common handling of initialization failure by providing the printing of a warning message. For Arm, xsm_dt_init() was tailored to have an Arm specific expansion of the return values. This expansion added a value to reflect whether the security supported XSM policy module was the enforcing policy module. This was then = used to determine if a warning message would be printed. Despite this expansion, like x86, Arm does not address any XSM initialization errors that may have occurred. Signed-off-by: Daniel P. Smith Reviewed-by: Bertrand Marquis # arm --- xen/arch/arm/setup.c | 10 +++++----- xen/arch/x86/setup.c | 9 +++++++-- xen/xsm/xsm_core.c | 22 +++++++++++----------- 3 files changed, 23 insertions(+), 18 deletions(-) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index ea1f5ee3d3..6bf71e1064 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -967,11 +967,11 @@ void __init start_xen(unsigned long boot_phys_offset, =20 tasklet_subsys_init(); =20 - if ( xsm_dt_init() !=3D 1 ) - warning_add("WARNING: SILO mode is not enabled.\n" - "It has implications on the security of the system,\n" - "unless the communications have been forbidden between= \n" - "untrusted domains.\n"); + if ( xsm_dt_init() ) + warning_add("WARNING: XSM failed to initialize.\n" + "This has implications on the security of the system,\= n" + "as uncontrolled communications between trusted and\n" + "untrusted domains may occur.\n"); =20 init_maintenance_interrupt(); init_timer_interrupt(); diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 53a73010e0..ed67b50c9d 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #ifdef CONFIG_COMPAT @@ -1690,7 +1691,7 @@ void __init noreturn __start_xen(unsigned long mbi_p) =20 open_softirq(NEW_TLBFLUSH_CLOCK_PERIOD_SOFTIRQ, new_tlbflush_clock_per= iod); =20 - if ( opt_watchdog )=20 + if ( opt_watchdog ) nmi_watchdog =3D NMI_LOCAL_APIC; =20 find_smp_config(); @@ -1700,7 +1701,11 @@ void __init noreturn __start_xen(unsigned long mbi_p) mmio_ro_ranges =3D rangeset_new(NULL, "r/o mmio ranges", RANGESETF_prettyprint_hex); =20 - xsm_multiboot_init(module_map, mbi); + if ( xsm_multiboot_init(module_map, mbi) ) + warning_add("WARNING: XSM failed to initialize.\n" + "This has implications on the security of the system,\= n" + "as uncontrolled communications between trusted and\n" + "untrusted domains may occur.\n"); =20 /* * IOMMU-related ACPI table parsing may require some of the system dom= ains diff --git a/xen/xsm/xsm_core.c b/xen/xsm/xsm_core.c index 8f6c3de8a6..6377895e1e 100644 --- a/xen/xsm/xsm_core.c +++ b/xen/xsm/xsm_core.c @@ -10,23 +10,17 @@ * as published by the Free Software Foundation. */ =20 -#include #include +#include +#include #include #include - -#include +#include #include =20 -#ifdef CONFIG_XSM - -#ifdef CONFIG_MULTIBOOT #include -#endif =20 -#ifdef CONFIG_HAS_DEVICE_TREE -#include -#endif +#ifdef CONFIG_XSM =20 #define XSM_FRAMEWORK_VERSION "1.0.1" =20 @@ -190,7 +184,13 @@ int __init xsm_dt_init(void) =20 xfree(policy_buffer); =20 - return ret ?: (xsm_bootparam =3D=3D XSM_BOOTPARAM_SILO); + if ( xsm_bootparam !=3D XSM_BOOTPARAM_SILO ) + warning_add("WARNING: SILO mode is not enabled.\n" + "It has implications on the security of the system,\n" + "unless the communications have been forbidden between= \n" + "untrusted domains.\n"); + + return ret; } =20 /** --=20 2.20.1