Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5E80BC433DF for ; Fri, 29 May 2020 11:34:57 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 387372074D for ; Fri, 29 May 2020 11:34:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 387372074D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=eu.citrix.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jedHj-0002d0-Sy; Fri, 29 May 2020 11:34:47 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jedHi-0002bw-SK for xen-devel@lists.xenproject.org; Fri, 29 May 2020 11:34:46 +0000 X-Inumbo-ID: 47b7cab2-a1a0-11ea-8993-bc764e2007e4 Received: from chiark.greenend.org.uk (unknown [2001:ba8:1e3::]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 47b7cab2-a1a0-11ea-8993-bc764e2007e4; Fri, 29 May 2020 11:33:56 +0000 (UTC) Received: from [172.18.45.5] (helo=zealot.relativity.greenend.org.uk) by chiark.greenend.org.uk (Debian Exim 4.84_2 #1) with esmtp (return-path ijackson@chiark.greenend.org.uk) id 1jed3b-0003xZ-5y; Fri, 29 May 2020 12:20:11 +0100 From: Ian Jackson To: xen-devel@lists.xenproject.org Subject: [OSSTEST PATCH 47/49] setupboot_grub2: Do not boot with XSM policy etc. unless xsm=1 Date: Fri, 29 May 2020 12:19:43 +0100 Message-Id: <20200529111945.21394-48-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200529111945.21394-1-ian.jackson@eu.citrix.com> References: <20200529111945.21394-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Ian Jackson Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" This prevents us from passing an XSM policy file, and `flask=enforcing', in supposedly-non-XSM tests. These bootloader entries can appear because the Xen upstream build ships XSM policy files by default even if XSM is disabled in the hypervisor, causing update-grub to generate useless `XSM enabled' entries. Signed-off-by: Ian Jackson --- Osstest/Debian.pm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm index c18bf718..b140ede2 100644 --- a/Osstest/Debian.pm +++ b/Osstest/Debian.pm @@ -499,6 +499,9 @@ sub setupboot_grub2 ($$$$) { } elsif ($want_xsm && !defined $entry->{Xenpolicy}) { logm("(skipping entry at $entry->{StartLine}..$.;". " XSM policy file not mentioned)"); + } elsif (!$want_xsm && defined $entry->{Xenpolicy}) { + logm("(skipping entry at $entry->{StartLine}..$.;". + " XSM policy file, but we don't want XSM)"); } elsif ($ho->{Suite} =~ m/buster/ && defined $entry->{Xenpolicy} && !$bootfiles{ -- 2.20.1