Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1kGHWb-00005T-56 for mharc-grub-devel@gnu.org; Thu, 10 Sep 2020 04:01:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45914) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kGHWa-00005A-4U for grub-devel@gnu.org; Thu, 10 Sep 2020 04:01:44 -0400 Received: from de-smtp-delivery-102.mimecast.com ([62.140.7.102]:27362) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kGHWY-0001Sy-42 for grub-devel@gnu.org; Thu, 10 Sep 2020 04:01:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1599724898; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rUvTCzkyUhKFSGm8uUGEhmrBWhFePTbPw13L44w2exc=; b=ZLZkWTVfFYVivVhQy1AGvKjyjhdQbCsFhUeY/CY+WsSb/V/Rf8k8W5oTFcCTEpVHOT5QX3 Nq6IPuWNqOtcGZHzHDoCz43wJJutLqJp5O9g2fn9wpjOeaZQrd2G9afy/8gyOuFR5xTWqL PQ/wjN1FMeIQ5TIPzNCEqJE2sqmZRxI= Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04lp2055.outbound.protection.outlook.com [104.47.12.55]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-22-co4dTCbqNRqEy1VVBVVAYg-1; Thu, 10 Sep 2020 10:01:36 +0200 X-MC-Unique: co4dTCbqNRqEy1VVBVVAYg-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IvjYmXB3pUqFkch7KCMS4K77LbT4EqfSw/VYpdqDsW3LVfmtygBZ+xtjgfQ7oseFT+Vw+H6hqh2Xv06Lc5H/CKibZnOfJCfRVm6ZWGfr6EBaSCFBB2MPFlbKNhDbiA7xDleKidkkDirZ8DOXXarJBkh7xnmUBh94+S0cgB60n2GqWwtywT/48txh4AKBsr2zM4hsGL1XcWsp8OSsIUQ3NUL7oKlwK4zeCkwZf5n0zHW8p9WryfLsNiQccbhHBFokW/emEvD7abN/tJ64twLv20TcstE7VlEn2Onq7OVozBcQhnEOpmVs/vDwNzcarW6ZkJPoBNvaOjHQImqNwdnosQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Mw0JMpR/0V/3AWl63Hux6Yjhjw5eDYvGlJI3P5ovfuE=; b=IR65WXMT5dBBuBss/kjkXugfR2dNpAtOuLTMAUrPloNKKDOpzCXp9vAO6Nx6DcFYm1435/aVMe1S5FDMXuSKE0HSO1xbtHjJdrAzpAtmlvfMSS/cKmmd9vxIzivK7IpmLRmG76pV2A4aK86cqRy+2y6HA0MgT0Bgsh45B1dvhL5x79a+pelFUMt7hApjDAMJMQHKDI40xSR2H63uItBGRiN6JdQpc2GTTi3vsVLeEnFOjOWfGcBijI5IF/s1bEZl6y6nAlV+lTQN1KoqZGkI0dtGoh1g4iDIjB6BV0wsfST2IjSN7sH4QbtLMun5q5WNi0burJ/QHZ/inA5VlKrtgw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: gnu.org; dkim=none (message not signed) header.d=none;gnu.org; dmarc=none action=none header.from=suse.com; Received: from VI1PR04MB4991.eurprd04.prod.outlook.com (2603:10a6:803:57::28) by VI1PR04MB7072.eurprd04.prod.outlook.com (2603:10a6:800:12c::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3370.16; Thu, 10 Sep 2020 08:01:36 +0000 Received: from VI1PR04MB4991.eurprd04.prod.outlook.com ([fe80::c979:8c82:11b9:b4be]) by VI1PR04MB4991.eurprd04.prod.outlook.com ([fe80::c979:8c82:11b9:b4be%7]) with mapi id 15.20.3348.019; Thu, 10 Sep 2020 08:01:36 +0000 From: Michael Chang To: The development of GNU GRUB Subject: [PATCH] shim_lock: Disable GRUB_VERIFY_FLAGS_DEFER_AUTH if secure boot off Date: Thu, 10 Sep 2020 16:01:23 +0800 Message-ID: <20200910080123.30917-1-mchang@suse.com> X-Mailer: git-send-email 2.26.2 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain X-ClientProxiedBy: HK0PR03CA0104.apcprd03.prod.outlook.com (2603:1096:203:b0::20) To VI1PR04MB4991.eurprd04.prod.outlook.com (2603:10a6:803:57::28) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from mercury.nue.suse.com (2001:b011:30d0:325a:a9ad:fbaf:aacc:59d2) by HK0PR03CA0104.apcprd03.prod.outlook.com (2603:1096:203:b0::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3370.16 via Frontend Transport; Thu, 10 Sep 2020 08:01:35 +0000 X-Mailer: git-send-email 2.26.2 X-Originating-IP: [2001:b011:30d0:325a:a9ad:fbaf:aacc:59d2] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 32aa4bbb-fd04-4ddd-812a-08d8555fbd3b X-MS-TrafficTypeDiagnostic: VI1PR04MB7072: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8273; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5bmve6rqT2A461l2nioqH5xoVmZTzm9O4ohtaW4ObIrBZiLAdHtvbaLbc5QyFp65HmVe3E2rv+rvgm7734uDOfO2aDuMzxo9/89ag4BLquuYsACzY+yOOnT5o5Vrnr3RQgMDK8kOqSuGSam5HCbusem7rGvLSfAwKKMbQo6kPPTZlPUYfCXFh7pi1JM5wGFuN+LDFbbVCW2e1Fwt0EWvxFg6CntW7IhrJPGidhW2RZuPgdNq5xbUyfwqrMifrjCLRuXhN7GBoRcHxHWjJT4UdykkduKL/i5kHzjKsAkRyPybJC55+mG19kdDyCHg35Wa8hVmXmR6xI52zL5HEDyudQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB4991.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(346002)(376002)(136003)(39860400002)(396003)(366004)(8936002)(6916009)(66946007)(186003)(36756003)(66476007)(6666004)(1076003)(16526019)(66556008)(52116002)(6486002)(478600001)(2616005)(7696005)(316002)(86362001)(2906002)(83380400001)(5660300002)(8676002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: 5m4auJ1jufYHqFDX4OvAgpk1kfUETWWYNKK6TEEhm7wWSfGT5dnUkeasv6SpKsak9oJ2pxPS6kkWps8DRaOAT7LW828Z6DZVwSaI7+lovu7yvB4Ntc+JxfxUddThuJjcQIEKKdbO0vUWDgqFHprHbLFQO692/BZOE7xKM4lqRjKXFV9adpN+ZQWZTab0FKmsCCKfxKUj7romgP1TJFC0TMb+71HGJUNvvA578XTRlpf0/Rwyz/Rrtq66U82/BCllkxWkvOBFXsvPoUN5Cx4ayaoaBZnbusSkNJhpb3HZqwtL3pdmu5luDMyaW38qyFiwe0r1sfgo2OjPjBR7jTKOAjc0n1Arha/nlM5+CRuJEUp90HLguq6O1pojiiu9vfmQSG380Mr6lb++EhJ9ETMNs5jf4Cah4WinJ0VFMdxUtnQoClg8G+0gYNhH2fUxLJa/5zWQw6hPPmMqdVARxEQg618U0ptJMcaAeU/cn+v6ZNFDil9hAmmwbsxinoNvy0k741UkvR+7iGmUfXUyObHWdtGUrLRSN3rw5JMNFX652lRJOnsBrPxDraxzHYhdJCcocBUOWyBMW5hZ33GwQCLz5/Xc75lwR/BVdGLuG5IwA6Knz9h4DWStGWj/7qYBNEPUOWBCgyGj5hIzXDIcR1XNkKT1rRFCr8M1fQha6sakybMiLQW0BNSuiRQFOFA7D8S9WWD2FXzzAOURvRZQBHkhPw== X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 32aa4bbb-fd04-4ddd-812a-08d8555fbd3b X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB4991.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Sep 2020 08:01:35.9801 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: lJzX7O1+/PyKBPm+dekDIeWLmJxy2oQD3PfQ6zRI54Xe/pF9F4Q83Qp3Qbya2oIT X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB7072 Received-SPF: pass client-ip=62.140.7.102; envelope-from=mchang@suse.com; helo=de-smtp-delivery-102.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/10 04:01:38 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Sep 2020 08:01:44 -0000 The GRUB_VERIFY_FLAGS_DEFER_AUTH is enabled regardless secure boot status that will cause error [1] on loading external grub modules if secure boot turned off in which shim protocol itself did not verify images so should not request verification for external modules either. This patch fixed the problem by adding the secure boot status check before requesting other verifiers to verify external module, therefore external module loading can work after shim_lock module loaded and secure boot turned off. [1] error: verification requested but nobody cares: (hd0,gpt10)/boot/grub2/x86_64-efi/linux.mod. Signed-off-by: Michael Chang --- grub-core/commands/efi/shim_lock.c | 31 +++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/grub-core/commands/efi/shim_lock.c b/grub-core/commands/efi/sh= im_lock.c index 764098cfc..e0da81ce5 100644 --- a/grub-core/commands/efi/shim_lock.c +++ b/grub-core/commands/efi/shim_lock.c @@ -45,6 +45,34 @@ static grub_efi_shim_lock_protocol_t *sl; /* List of modules which cannot be loaded if UEFI secure boot mode is enab= led. */ static const char * const disabled_mods[] =3D {"iorw", "memrw", "wrmsr", N= ULL}; =20 +static grub_efi_boolean_t +grub_efi_secure_boot (void) +{ + grub_efi_guid_t efi_var_guid =3D GRUB_EFI_GLOBAL_VARIABLE_GUID; + grub_size_t datasize; + char *secure_boot =3D NULL; + char *setup_mode =3D NULL; + grub_efi_boolean_t ret =3D 0; + + secure_boot =3D grub_efi_get_variable("SecureBoot", &efi_var_guid, &data= size); + + if (datasize !=3D 1 || !secure_boot) + goto out; + + setup_mode =3D grub_efi_get_variable("SetupMode", &efi_var_guid, &datasi= ze); + + if (datasize !=3D 1 || !setup_mode) + goto out; + + if (*secure_boot && !*setup_mode) + ret =3D 1; + + out: + grub_free (secure_boot); + grub_free (setup_mode); + return ret; +} + static grub_err_t shim_lock_init (grub_file_t io, enum grub_file_type type, void **context __attribute__ ((unused)), @@ -82,7 +110,8 @@ shim_lock_init (grub_file_t io, enum grub_file_type type= , =20 case GRUB_FILE_TYPE_ACPI_TABLE: case GRUB_FILE_TYPE_DEVICE_TREE_IMAGE: - *flags =3D GRUB_VERIFY_FLAGS_DEFER_AUTH; + if (grub_efi_secure_boot()) + *flags =3D GRUB_VERIFY_FLAGS_DEFER_AUTH; =20 return GRUB_ERR_NONE; =20 --=20 2.26.2