From patchwork Tue Nov 30 11:04:12 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: 1561562 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=lBZrtrBj; dkim-atps=neutral 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=) 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4J3KB14WmGz9sRR for ; Tue, 30 Nov 2021 22:04:57 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1ms0wK-0007O0-3b; Tue, 30 Nov 2021 11:04:48 +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 1ms0wA-0007Dp-Vo for kernel-team@lists.ubuntu.com; Tue, 30 Nov 2021 11:04:38 +0000 Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) (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 AE8313F1D6 for ; Tue, 30 Nov 2021 11:04:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1638270277; bh=AfLtNN0lYDa/HXdyRPOcLfo0WLppEkUd9lrzoEYDhsE=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=lBZrtrBjN7Q82SSlm4agpHRDOGFIZF+IuDXFpyi0QughUyAtUC5SxDu697tbi5kYT JTalrCEbzIPHoXwcFT7LC46LjLelleuTCEB25PgRsdsBd7pLYt1G3JeGqcN8MWDEZw 4XQGgSjGBSZ3j9G8HN0yvBqrlBiGMvhTMyAxjy7S1N4eyAb80x/b9L6U4NYERQm2NB 03OTs+D2Q25u9C9DAK7SpU/xCSB0vYWJN7s0gQ1WZtQHHTyiEqNETYfPCMA9mdFQ3p uyVBoUEix6hlwVLtJibZrMGx4fAhTJmmj5n0lc3npa93TNIK1jwmXnef5bWi3rmon+ Tr1KSSWUv1mjg== Received: by mail-ed1-f69.google.com with SMTP id v1-20020aa7cd41000000b003e80973378aso16558981edw.14 for ; Tue, 30 Nov 2021 03:04:37 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=AfLtNN0lYDa/HXdyRPOcLfo0WLppEkUd9lrzoEYDhsE=; b=M2OYDX62VWcZRFq55XMkdim89yx7/VzGtq8rX9hfYFeExWRk5+HglY5bvIRT8mVE8q vzGfwU92G0Pqnsk0FIRI20t2eZp3TeCW4zXxiexax7zpqEcGf9jNvP3yVDiGmX+bf7M+ 4fHqcWT83KoNrqCaCXy8swvmR+vH4A/7/Wtd58DBh5DWTjgJgJ0KEsRXvK7SLEFoc10i bXbvMm2UoPxMMYPvvZczwQulw+tJjIV6H1E1lRj+ptKLFeiklnRvpWBsYQJ4t2fqLF0U Azo4OdC0sojlKt3qjS54M4AhN70A99d9XLcB7EcXlp5JbpBHBoeEn8K+MPPgkfkfw8gy U0DA== X-Gm-Message-State: AOAM533rAvd+LZQyLat2xVnd8TkQLIKol74jy64vW98kbNxfqPGTE62Q 6hpLa28eIW9LE7R+PZM/fb8wr5bB1vM3TP1zrm4uR3gmgt/0g5mg81js6obVNTuz2L37bPINWrP fWydz/kz33rPQo2GwsFQHkvMk5sAdJjY26JWjHvx19Q== X-Received: by 2002:a05:6402:4301:: with SMTP id m1mr81475273edc.54.1638270277014; Tue, 30 Nov 2021 03:04:37 -0800 (PST) X-Google-Smtp-Source: ABdhPJx/bdza8rPGaneFl/Hs8LZfcXlgvzAvPv+tfHKDdNx2xLsHs+icYGeoXhHgU1FXt4ZwL5jzBg== X-Received: by 2002:a05:6402:4301:: with SMTP id m1mr81475247edc.54.1638270276758; Tue, 30 Nov 2021 03:04:36 -0800 (PST) Received: from localhost ([2001:67c:1560:8007::aac:c15c]) by smtp.gmail.com with ESMTPSA id f22sm12105647edf.93.2021.11.30.03.04.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 03:04:36 -0800 (PST) From: Dimitri John Ledkov To: kernel-team@lists.ubuntu.com Subject: [SRU][BIONIC][PATCH 12/16] UBUNTU: SAUCE: integrity: add informational messages when revoking certs Date: Tue, 30 Nov 2021 11:04:12 +0000 Message-Id: <20211130110416.171269-13-dimitri.ledkov@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211130110416.171269-1-dimitri.ledkov@canonical.com> References: <20211130110416.171269-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) (xnox: cherry-pick is from impish:linux SAUCE) Signed-off-by: Dimitri John Ledkov --- certs/blacklist.c | 3 +++ certs/load_uefi.c | 1 + 2 files changed, 4 insertions(+) diff --git a/certs/blacklist.c b/certs/blacklist.c index 8f34077714..a97d50b9f0 100644 --- a/certs/blacklist.c +++ b/certs/blacklist.c @@ -166,6 +166,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/certs/load_uefi.c b/certs/load_uefi.c index a99e7563d0..9783e5978f 100644 --- a/certs/load_uefi.c +++ b/certs/load_uefi.c @@ -114,6 +114,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); }