From patchwork Mon Aug 23 13:33:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dimitri John Ledkov X-Patchwork-Id: 1519698 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=T449Mncm; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GtYB91Vl1z9sWq; Mon, 23 Aug 2021 23:34:25 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1mIA5m-0008Nc-2X; Mon, 23 Aug 2021 13:34:22 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1mIA5d-0008Kj-A6 for kernel-team@lists.ubuntu.com; Mon, 23 Aug 2021 13:34:13 +0000 Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 25CC44075D for ; Mon, 23 Aug 2021 13:34:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1629725653; bh=zL5RCN/aE1zSoyJXmTma4c/JNDeaNitjV6OCScRnDnA=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=T449MncmqpjA8eyl+slAxDZhTWq9vLXkvlvpV6O7aLDU+0rk4fWkJ0l7qNkYp7YNN ATXS+svS/UvpOtfRjKR49ihPMc5WhtZIDFL9IugRYak0JUsXeSfv+sywgHPVaBjtMI MbhC6XQSVnKRMVXsXs97YDhWjJi4dhNZvSSgakeGJS3Cxr2nk3sGYmYTQc9B7HOOej uAketHfMEIko6StA9e2N+cn1M0EtOlAl4G4V83EMEsXkNAGx8LaqhE74czNMET3ANJ e6HOXmdMPJE8gWLEWxm+jwgplH2ciCEjaKS5BGejSbnMPRe62sBoWRRIdDxsWoKEhK Xq9uhoWX5AHtQ== Received: by mail-wr1-f72.google.com with SMTP id t15-20020a5d42cf000000b001565f9c9ee8so5068303wrr.2 for ; Mon, 23 Aug 2021 06:34:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zL5RCN/aE1zSoyJXmTma4c/JNDeaNitjV6OCScRnDnA=; b=ACGa6/HUV9N3pBpuU6sgAQEmlqFLOMC7bM3SVXIan8r7tmclgphRRgmkE8GqA4IZ0u 2RVEduu4HSrGO3ppNcpGWUWqKsu8ZaMk0JjQrHv2bE+Zrot7UFhxslSg+dBNkN+kRauW hoMNwEbzYbZEXVFj2T3a0BMhvtXnBK5BUSVIG8lSvsGF8Csf3wIUEqCdkFYPnMkUO10Z egHvkXCbvacOueqWrN9ESOkIpFKEsBUX9XuO5cDsaPHVYO2XgAwUoVHPNRwAspHkqs/9 saj36+4nU2PZ2WeX+YGAT4timX2PwLcMb+0mU5INqE/orN1soi0T/sbwHi2LktsyuBGJ wwiw== X-Gm-Message-State: AOAM531jzndhR1Mx7vCt6zCfVL9wG60OOdr81zSEDZDc8IhU3ka1V8zf 8bc7qjkaX7JAqt7zJZ55ATwlSnHdtisrQPPsAp7ps6+zpyz8UOIyRl354Chkh3YZYQCg70mmnV6 vy/JVw4oHoyhUAq9wQXWNFAqyFrNn06jhFWl1RgVdOw== X-Received: by 2002:a1c:1d87:: with SMTP id d129mr1310120wmd.185.1629725652552; Mon, 23 Aug 2021 06:34:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzqiALv3xf4Q91dwYQNTYT8QkHoouy47cTG2NHPdGnOXQw+lHODAxtugBavbcqOeRQrG35aUg== X-Received: by 2002:a1c:1d87:: with SMTP id d129mr1310094wmd.185.1629725652372; Mon, 23 Aug 2021 06:34:12 -0700 (PDT) Received: from localhost ([2a01:4b00:85fd:d700:79d7:6045:c3:b370]) by smtp.gmail.com with ESMTPSA id n15sm7335855wmq.7.2021.08.23.06.34.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Aug 2021 06:34:12 -0700 (PDT) From: Dimitri John Ledkov To: kernel-team@lists.ubuntu.com Subject: [FOCAL][linux-oem-5.10][PATCH 07/10] UBUNTU: SAUCE: integrity: add informational messages when revoking certs Date: Mon, 23 Aug 2021 14:33:50 +0100 Message-Id: <20210823133353.37046-8-dimitri.ledkov@canonical.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210823133353.37046-1-dimitri.ledkov@canonical.com> References: <20210823133353.37046-1-dimitri.ledkov@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" integrity_load_cert() prints messages of the source and cert details when adding certs as trusted. Mirror those messages in uefi_revocation_list_x509() when adding certs as revoked. Sample dmesg with this change: integrity: Platform Keyring initialized integrity: Loading X.509 certificate: UEFI:db integrity: Loaded X.509 cert 'Microsoft Corporation UEFI CA 2011: 13adbf4309bd82709c8cd54f316ed522988a1bd4' integrity: Revoking X.509 certificate: UEFI:MokListXRT (MOKvar table) blacklist: Revoked X.509 cert 'Canonical Ltd. Secure Boot Signing: 61482aa2830d0ab2ad5af10b7250da9033ddcef0' integrity: Loading X.509 certificate: UEFI:MokListRT (MOKvar table) integrity: Loaded X.509 cert 'Canonical Ltd. Master Certificate Authority: ad91990bc22ab1f517048c23b6655a268e345a63' BugLink: https://bugs.launchpad.net/bugs/1928679 Signed-off-by: Dimitri John Ledkov Acked-by: Krzysztof Kozlowski Signed-off-by: Seth Forshee (cherry picked from commit ba9fb788f89cb81c5ed836db2355a7a3b0f8c248) Signed-off-by: Dimitri John Ledkov Acked-by: Stefan Bader Acked-by: Andy Whitcroft [KelseyS: SHA1 from cherry pick line is from Impish. Patch has been submitted to upstream, though not yet reviewed/applied.] Signed-off-by: Kelsey Skunberg --- certs/blacklist.c | 3 +++ security/integrity/platform_certs/keyring_handler.c | 1 + 2 files changed, 4 insertions(+) diff --git a/certs/blacklist.c b/certs/blacklist.c index c973de883c..7638dfaca7 100644 --- a/certs/blacklist.c +++ b/certs/blacklist.c @@ -171,6 +171,9 @@ int add_key_to_revocation_list(const char *data, size_t size) if (IS_ERR(key)) { pr_err("Problem with revocation key (%ld)\n", PTR_ERR(key)); return PTR_ERR(key); + } else { + pr_notice("Revoked X.509 cert '%s'\n", + key_ref_to_ptr(key)->description); } return 0; diff --git a/security/integrity/platform_certs/keyring_handler.c b/security/integrity/platform_certs/keyring_handler.c index 5604bd57c9..9f85626702 100644 --- a/security/integrity/platform_certs/keyring_handler.c +++ b/security/integrity/platform_certs/keyring_handler.c @@ -61,6 +61,7 @@ static __init void uefi_blacklist_binary(const char *source, static __init void uefi_revocation_list_x509(const char *source, const void *data, size_t len) { + pr_info("Revoking X.509 certificate: %s\n", source); add_key_to_revocation_list(data, len); }