Received: by 2002:a05:6a10:a0d1:0:0:0:0 with SMTP id j17csp3371132pxa; Tue, 25 Aug 2020 20:49:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwr70meBsLOGylKj3cEWFE3UHkJ2ePz5MXNUMIeEO4egaPqUt78MjcQHZjMPJEBNyXWFLTd X-Received: by 2002:a17:906:85c1:: with SMTP id i1mr6217127ejy.97.1598413749092; Tue, 25 Aug 2020 20:49:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1598413749; cv=none; d=google.com; s=arc-20160816; b=xX3b4trP0K2V8RcpBUJZBeIB4rwajxPeHFlf0mKjXZB6vu6e4YAyhUiOQ/Zx3PwQcc Oyk9m7G3byeaulXquldTldadRUQaEY1n7IS4Ibx11qbesit1wRfjfEgkNvpAagJaJkk2 kDEaRbLBrL6w0zk6JneqIMoa8IMbFm6vSAuGHW9dMCApzEC5hmbBXxe5EVzZhdaV0XtF PrEoUkvWxEpsgQUhl674i9WmnghIjEvU/ptGi2wG387wV5L1mudkG1oW7fgYiCB7+chV 84WheYg3zpgXmP/CIwqS0IFywrsBint7RlWDZekrE9PNJtAIUcORWeDgPd5P9IpqukBG G0kw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:to:from:dkim-signature; bh=8T5WfWs/Tv1MkqhnVgGnky3bmtEaukh+fceB8s7dUAI=; b=RENjGwuK3sjKn4/DdnxHQrcqAqz5CD8URfcIIeqqcQtw0yEhH5UEYT5fMqVxyEaZuQ QMDYQ7ETLiW3JJqOlH0/qCfrXRJv9vssoDgIvDfhVv9Gvezvt3kwJM6MOZAS1kO+7OXW shL/1giP0AVE2wYzw5t/Q4oJVcQ58/ewgdJGu15pVGrCETGlasVV6nlqi0L7rMPfemKa 2CeN7iYXXg+Okrmu/2KGe7AQHC0+sfDGbvtlN46soeSduIFN+cFliEUtVYH9ZuaB+rDo OH9FayBAIMAm6si5CyxnbedRrM0+fiyX53bKJIih2uNRUs4optSKODNjErvMcR1krnNB qhrA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=bPoRkC3U; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id q12si615100edr.105.2020.08.25.20.48.46; Tue, 25 Aug 2020 20:49:09 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=bPoRkC3U; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726863AbgHZDpZ (ORCPT + 99 others); Tue, 25 Aug 2020 23:45:25 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:22869 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726838AbgHZDpR (ORCPT ); Tue, 25 Aug 2020 23:45:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598413516; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:in-reply-to:in-reply-to:references:references; bh=8T5WfWs/Tv1MkqhnVgGnky3bmtEaukh+fceB8s7dUAI=; b=bPoRkC3UPeSIIHqx3+9eHw3G+Eqyp8o0m96RskYcGizz9NeOD/ABG9P8GX1XeVObWjRbWl GAppN8CkvrBTGbVCeOhY4xO5aiyHHYNAVSsXYV8ikJdK2iAsgUgQ+0Vwp4AZLTus5Ox3Xv aNkNK47KGYbJawAuD4NSzl9BqhNXT8M= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-293-MeUhVzXSOAKGS-OxOO4fTw-1; Tue, 25 Aug 2020 23:45:12 -0400 X-MC-Unique: MeUhVzXSOAKGS-OxOO4fTw-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AFA0F1DDE0; Wed, 26 Aug 2020 03:45:10 +0000 (UTC) Received: from lszubowi.redhat.com (unknown [10.10.110.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5588B5D9E4; Wed, 26 Aug 2020 03:45:08 +0000 (UTC) From: Lenny Szubowicz To: linux-kernel@vger.kernel.org, linux-efi@vger.kernel.org, platform-driver-x86@vger.kernel.org, linux-security-module@vger.kernel.org, ardb@kernel.org, jmorris@namei.org, serge@hallyn.com, keescook@chromium.org, zohar@linux.ibm.com, bp@alien8.de, pjones@redhat.com, dhowells@redhat.com, prarit@redhat.com Subject: [PATCH 3/3] integrity: Load certs from the EFI MOK config table Date: Tue, 25 Aug 2020 23:44:55 -0400 Message-Id: <20200826034455.28707-4-lszubowi@redhat.com> In-Reply-To: <20200826034455.28707-1-lszubowi@redhat.com> References: <20200826034455.28707-1-lszubowi@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Because of system-specific EFI firmware limitations, EFI volatile variables may not be capable of holding the required contents of the Machine Owner Key (MOK) certificate store. Therefore, an EFI boot loader may pass the MOK certs via a EFI configuration table created specifically for this purpose to avoid this firmware limitation. An EFI configuration table is a much more primitive mechanism compared to EFI variables and is well suited for one-way passage of static information from a pre-OS environment to the kernel. This patch adds the support to load certs from the MokListRT entry in the MOK variable configuration table, if it's present. The pre-existing support to load certs from the MokListRT EFI variable remains and is used if the EFI MOK configuration table isn't present or can't be successfully used. Signed-off-by: Lenny Szubowicz --- security/integrity/platform_certs/load_uefi.c | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/security/integrity/platform_certs/load_uefi.c b/security/integrity/platform_certs/load_uefi.c index 547410d8ffa5..2c9c847d9b62 100644 --- a/security/integrity/platform_certs/load_uefi.c +++ b/security/integrity/platform_certs/load_uefi.c @@ -72,6 +72,9 @@ static __init void *get_cert_list(efi_char16_t *name, efi_guid_t *guid, * * Load the certs contained in the UEFI MokListRT database into the * platform trusted keyring. + * + * This routine checks the EFI MOK config table first. If and only if + * that fails, this routine uses the MokListRT ordinary UEFI variable. */ static int __init load_moklist_certs(void) { @@ -79,8 +82,27 @@ static int __init load_moklist_certs(void) void *mok = NULL; unsigned long moksize = 0; efi_status_t status; + struct efi_mokvar_table_entry *mokvar_entry = NULL; int rc = 0; + /* First try to load certs from the EFI MOKvar config table. + * It's not an error if the MOKvar config table doesn't exist + * or the MokListRT entry is not found in it. + */ + mokvar_entry = efi_mokvar_entry_find("MokListRT"); + if (mokvar_entry) { + rc = parse_efi_signature_list("UEFI:MokListRT (MOKvar table)", + mokvar_entry->data, + mokvar_entry->data_size, + get_handler_for_db); + /* All done if that worked. */ + if (!rc) + return rc; + + pr_err("Couldn't parse MokListRT signatures from EFI MOKvar config table: %d\n", + rc); + } + /* Get MokListRT. It might not exist, so it isn't an error * if we can't get it. */ -- 2.27.0