From nobody Sun Feb 8 17:21:06 2026 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=1653950481; cv=pass; d=zohomail.com; s=zohoarc; b=WEhxhiBLvjVF1homqMS7pGN09F7zBC9o7Hbmx9c4geKuIDSFzbu6PEq85S7LFOvEkPLrkKfQf0eNK33QouHnXMcSEpaPhIs2yTWEYrlNKun7W6QaehgNDwh6DYfBF+DsJh2m4jIw2EPbXYWiOfG4tdLH/g8A1bidFiWKid9XcdA= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1653950481; 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=la2M5tzx6KopMzM+HRFDW7uoKG8zyKI9t+pOJKEm7RzrmlBVsT+K0o/C0uF7cmg2FH24TncU5L/itzNrtg6awW3UNi5rXuzTzKT+0lgSaew9dEVRwOtImX1D2npXKQNUApaUhXOd5GPYoKl7hptfnYe+L/opxtfZyajJX79oEiA= 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 1653950481145985.6978008301145; Mon, 30 May 2022 15:41:21 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.338862.563705 (Exim 4.92) (envelope-from ) id 1nvo4L-0007qn-5K; Mon, 30 May 2022 22:41:01 +0000 Received: by outflank-mailman (output) from mailman id 338862.563705; Mon, 30 May 2022 22:41:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1nvo4L-0007qf-1G; Mon, 30 May 2022 22:41:01 +0000 Received: by outflank-mailman (input) for mailman id 338862; Mon, 30 May 2022 22:40:59 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1nvo4J-000799-2A for xen-devel@lists.xenproject.org; Mon, 30 May 2022 22:40:59 +0000 Received: from sender4-of-o51.zoho.com (sender4-of-o51.zoho.com [136.143.188.51]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 913f81d1-e069-11ec-837f-e5687231ffcc; Tue, 31 May 2022 00:40:57 +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 1653950420926611.7977371210424; Mon, 30 May 2022 15:40:20 -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: 913f81d1-e069-11ec-837f-e5687231ffcc ARC-Seal: i=1; a=rsa-sha256; t=1653950423; cv=none; d=zohomail.com; s=zohoarc; b=Q1nnC1nn3zePeyAu2QZJrs+CV8LOCaWnInhAuKCH0PWQF66UanH2JFPiEF4dh39r+Cd+Z1avIOpgx0qiSCygkaadiYWmiNNFZu/zsBkEPHDQSitKoagitMVeAEyopdBT4wrwD/5QeVHwsH1WoytgU0jvmpxqfacSxCLOg0Fo658= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1653950423; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=Sjrnmu86gujeudz33+MAWmkOkhEiPemzBi/wKxHuwM0=; b=Y0Wr/Xef4SfE9Uhb9H/8QEI0HFA2qArR2RvbASNZTQNMvDP4LghQ39TmDthDLf08trl3+N2zb+0N4EXj8adoiW4C6ibss9IOb111rKpzmnlom7zosNJxrE1uFP6bn5EaQdSG3j4KaYN3yCUJj2fUYIslbAhVJdymYwutMUZEWYo= 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=1653950423; 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=lJocetZNXMF8Sn3/gMH+c9NxySv2OYe6r1+QRh/pVzBoqnTgPE0wMrBfIQIJMdn+ S04mtPUFsjWMdQ4G34hDGfTYPRGg3vcivu96zsMUoONv/A7wtJpF2e+hLon8VU6plaM H0VybZ1ojBHiMYr0+qm8zSxpXSe93UUxOhea3Kos= 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: [v2 2/3] xsm: consolidate loading the policy buffer Date: Mon, 30 May 2022 22:39:43 -0400 Message-Id: <20220531023945.22196-4-dpsmith@apertussolutions.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220531023945.22196-1-dpsmith@apertussolutions.com> References: <20220531023945.22196-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: 1653950481864100001 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