Received: by 2002:a05:6a10:2785:0:0:0:0 with SMTP id ia5csp344788pxb; Thu, 14 Jan 2021 07:20:17 -0800 (PST) X-Google-Smtp-Source: ABdhPJx3aN54hse7CImfzTHDU6B/qVEA0JDiVm3zlr+EzeorsvFJoltA+ob7eholSRukL3aQUWKT X-Received: by 2002:a17:906:3ac8:: with SMTP id z8mr5585009ejd.273.1610637617698; Thu, 14 Jan 2021 07:20:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1610637617; cv=none; d=google.com; s=arc-20160816; b=hJ2GFTffgiGCAcj00/d1NyPi1bttOGQwvuxVyKom6Y+fws4s8hVuP03XUiXHIWpeHG YXl1co0WwxBlCeq33aK1ffHlgL8XqAN+Sl20M5VgjhBnh3qF8iJxaRdEVPQhisCbiFMh DRM8Mlihd/Z+hWPk+lhyd311zNSYyyp+q4YkMH4USBzLdohjFjBzbpHhfFGwC57bhV0s EBCDEaiPK3vs1fg4NpV7V8bqXwO3wa/WzXmaj9H1yOf1CoUPIqyNnjzTFIUlBS2pJaRE 6Vgtq3gX9HVkW8bQ05huneEJnUdjX5NGx73tYMLMt2iDZ4KBDglIkh6+vZETlWtbtXF2 cctQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=MEXkrWX/Cd50mWa9ARlVOFjW80UpHaQ/BSlYiz32hSk=; b=LJkvjV70Uf5AB2wNxHhmMu/c16eaK454CcXmZE2pZuVNGYVLKjw/jWAtxNeaYclb92 3fAgQwNGXd4BEcUQBjpomaYNT1XvjSmpkGVE2raUgJlJJs7jCEdKQNQL5h5vTZjeJ2hs izSGdcctGoJXRv8718vwkeR2m5zdqgI45sfq5isJXNr7VG4Vk9Thh4NQ92jjMqBFep/4 QefA2Au/0UyeS96BO18N+oti65nJQ2ufI76IT+mrZzLW0LcIt4NbiwKG/WgdYozZ30EW khiFlqjmkAe42MsNCNcAxf61DbQ9YVKFu58n/1CY+lvkrm11yZUf8k5K38a0HKbIqbRB 9EDw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id hk1si2505246ejb.343.2021.01.14.07.19.57; Thu, 14 Jan 2021 07:20:17 -0800 (PST) Received-SPF: pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727446AbhANPTu (ORCPT + 99 others); Thu, 14 Jan 2021 10:19:50 -0500 Received: from smtp-bc0a.mail.infomaniak.ch ([45.157.188.10]:34757 "EHLO smtp-bc0a.mail.infomaniak.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729142AbhANPTu (ORCPT ); Thu, 14 Jan 2021 10:19:50 -0500 Received: from smtp-2-0001.mail.infomaniak.ch (unknown [10.5.36.108]) by smtp-3-3000.mail.infomaniak.ch (Postfix) with ESMTPS id 4DGnyv17ylzMprrf; Thu, 14 Jan 2021 16:19:03 +0100 (CET) Received: from localhost (unknown [23.97.221.149]) by smtp-2-0001.mail.infomaniak.ch (Postfix) with ESMTPA id 4DGnys0Ff7zlh8TH; Thu, 14 Jan 2021 16:19:00 +0100 (CET) From: =?UTF-8?q?Micka=C3=ABl=20Sala=C3=BCn?= To: David Howells , David Woodhouse , Jarkko Sakkinen Cc: =?UTF-8?q?Micka=C3=ABl=20Sala=C3=BCn?= , "David S . Miller" , Herbert Xu , James Morris , =?UTF-8?q?Micka=C3=ABl=20Sala=C3=BCn?= , Mimi Zohar , "Serge E . Hallyn" , keyrings@vger.kernel.org, linux-crypto@vger.kernel.org, linux-integrity@vger.kernel.org, linux-kernel@vger.kernel.org, linux-security-module@vger.kernel.org Subject: [PATCH v3 00/10] Enable root to update the blacklist keyring Date: Thu, 14 Jan 2021 16:18:59 +0100 Message-Id: <20210114151909.2344974-1-mic@digikod.net> X-Mailer: git-send-email 2.30.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org This third patch series includes back three fix patches taken from the first series (and cherry-picked from David Howells's tree [1]), and one cosmetic fix from Alex Shi which helps avoid future conflicts. I also added some Acked-by and improved comments. As requested, this series is based on v5.11-rc3. The goal of these patches is to add a new configuration option to enable the root user to load signed keys in the blacklist keyring. This keyring is useful to "untrust" certificates or files. Enabling to safely update this keyring without recompiling the kernel makes it more usable. [1] https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git/log/?h=keys-fixes Previous patch series: https://lore.kernel.org/lkml/20201211190330.2586116-1-mic@digikod.net/ Regards, Alex Shi (1): certs/blacklist: fix kernel doc interface issue David Howells (1): certs: Fix blacklist flag type confusion Mickaël Salaün (8): certs: Fix blacklisted hexadecimal hash string check PKCS#7: Fix missing include certs: Replace K{U,G}IDT_INIT() with GLOBAL_ROOT_{U,G}ID certs: Make blacklist_vet_description() more strict certs: Factor out the blacklist hash creation certs: Check that builtin blacklist hashes are valid certs: Allow root user to append signed hashes to the blacklist keyring tools/certs: Add print-cert-tbs-hash.sh MAINTAINERS | 2 + certs/.gitignore | 1 + certs/Kconfig | 10 + certs/Makefile | 15 +- certs/blacklist.c | 217 ++++++++++++++---- certs/system_keyring.c | 5 +- crypto/asymmetric_keys/x509_public_key.c | 3 +- include/keys/system_keyring.h | 14 +- include/linux/key.h | 1 + include/linux/verification.h | 2 + scripts/check-blacklist-hashes.awk | 37 +++ security/integrity/ima/ima_mok.c | 4 +- .../platform_certs/keyring_handler.c | 26 +-- security/keys/key.c | 2 + tools/certs/print-cert-tbs-hash.sh | 91 ++++++++ 15 files changed, 345 insertions(+), 85 deletions(-) create mode 100755 scripts/check-blacklist-hashes.awk create mode 100755 tools/certs/print-cert-tbs-hash.sh base-commit: 7c53f6b671f4aba70ff15e1b05148b10d58c2837 -- 2.30.0