LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Eric Snowberg <eric.snowberg@oracle.com>
To: Mimi Zohar <zohar@linux.ibm.com>
Cc: keyrings@vger.kernel.org,
	linux-integrity <linux-integrity@vger.kernel.org>,
	David Howells <dhowells@redhat.com>,
	David Woodhouse <dwmw2@infradead.org>,
	Herbert Xu <herbert@gondor.apana.org.au>,
	"David S . Miller" <davem@davemloft.net>,
	Jarkko Sakkinen <jarkko@kernel.org>,
	James Morris <jmorris@namei.org>,
	"Serge E . Hallyn" <serge@hallyn.com>,
	keescook@chromium.org, gregkh@linuxfoundation.org,
	torvalds@linux-foundation.org, scott.branden@broadcom.com,
	weiyongjun1@huawei.com, nayna@linux.ibm.com, ebiggers@google.com,
	ardb@kernel.org, nramas@linux.microsoft.com, lszubowi@redhat.com,
	linux-kernel@vger.kernel.org, linux-crypto@vger.kernel.org,
	linux-security-module@vger.kernel.org,
	James.Bottomley@HansenPartnership.com, pjones@redhat.com,
	"konrad.wilk@oracle.com" <konrad.wilk@oracle.com>
Subject: Re: [PATCH v5 04/12] integrity: restrict INTEGRITY_KEYRING_MACHINE to restrict_link_by_ca
Date: Thu, 9 Sep 2021 11:53:14 -0600	[thread overview]
Message-ID: <B34345FD-38F9-4722-B046-E250ACBD5B8C@oracle.com> (raw)
In-Reply-To: <c5d8d846cd03a97344700f8ce4f038cdc3e3b8fd.camel@linux.ibm.com>


> On Sep 9, 2021, at 11:25 AM, Mimi Zohar <zohar@linux.ibm.com> wrote:
> 
> On Tue, 2021-09-07 at 12:01 -0400, Eric Snowberg wrote:
>> Set the restriction check for INTEGRITY_KEYRING_MACHINE keys to
>> restrict_link_by_ca.  This will only allow CA keys into the machine
>> keyring.
>> 
>> Signed-off-by: Eric Snowberg <eric.snowberg@oracle.com>
> 
> Normally the new function, in this case the restriction, and usage
> should be defined together.  Any reason why 3/12 and 4/12 are two
> separate patches?  

I split them since they cross subsystems.

> I would squash them together.

But I can squash them together in the next round.

> 
>> ---
>> v1: Initial version
>> v2: Added !IS_ENABLED(CONFIG_INTEGRITY_TRUSTED_KEYRING check so mok
>>    keyring gets created even when it isn't enabled
>> v3: Rename restrict_link_by_system_trusted_or_ca to restrict_link_by_ca
>> v4: removed unnecessary restriction->check set
>> v5: Rename to machine keyring
>> ---
>> security/integrity/digsig.c | 8 ++++++--
>> 1 file changed, 6 insertions(+), 2 deletions(-)
>> 
>> diff --git a/security/integrity/digsig.c b/security/integrity/digsig.c
>> index 5a75ac2c4dbe..2b75bbbd9e0e 100644
>> --- a/security/integrity/digsig.c
>> +++ b/security/integrity/digsig.c
>> @@ -132,14 +132,18 @@ int __init integrity_init_keyring(const unsigned int id)
>> 		goto out;
>> 	}
>> 
>> -	if (!IS_ENABLED(CONFIG_INTEGRITY_TRUSTED_KEYRING))
>> +	if (!IS_ENABLED(CONFIG_INTEGRITY_TRUSTED_KEYRING) && id != INTEGRITY_KEYRING_MACHINE)
> 
> Over 80 chars, please split the line

I thought the 80 char limit was relaxed?  But if it hasn’t
I can change this too.  Thanks.




  reply	other threads:[~2021-09-09 17:54 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-07 16:00 [PATCH v5 00/12] Enroll kernel keys thru MOK Eric Snowberg
2021-09-07 16:00 ` [PATCH v5 01/12] integrity: Introduce a Linux keyring called machine Eric Snowberg
2021-09-09 13:55   ` Jarkko Sakkinen
2021-09-09 15:19   ` Mimi Zohar
2021-09-09 17:32     ` Eric Snowberg
2021-09-07 16:01 ` [PATCH v5 02/12] integrity: Do not allow machine keyring updates following init Eric Snowberg
2021-09-09 13:43   ` Jarkko Sakkinen
2021-09-07 16:01 ` [PATCH v5 03/12] KEYS: CA link restriction Eric Snowberg
2021-09-07 16:01 ` [PATCH v5 04/12] integrity: restrict INTEGRITY_KEYRING_MACHINE to restrict_link_by_ca Eric Snowberg
2021-09-09 13:49   ` Jarkko Sakkinen
2021-09-09 17:25   ` Mimi Zohar
2021-09-09 17:53     ` Eric Snowberg [this message]
2021-09-09 18:19       ` Mimi Zohar
2021-09-07 16:01 ` [PATCH v5 05/12] integrity: add new keyring handler for mok keys Eric Snowberg
2021-09-07 16:01 ` [PATCH v5 06/12] KEYS: add a reference to machine keyring Eric Snowberg
2021-09-07 16:01 ` [PATCH v5 07/12] KEYS: Introduce link restriction to include builtin, secondary and machine keys Eric Snowberg
2021-09-09 17:26   ` Mimi Zohar
2021-09-09 18:03     ` Eric Snowberg
2021-09-09 18:19       ` Mimi Zohar
2021-09-07 16:01 ` [PATCH v5 08/12] KEYS: integrity: change link restriction to trust the machine keyring Eric Snowberg
2021-09-09 17:27   ` Mimi Zohar
2021-09-07 16:01 ` [PATCH v5 09/12] KEYS: link secondary_trusted_keys to machine trusted keys Eric Snowberg
2021-09-07 16:01 ` [PATCH v5 10/12] integrity: store reference to machine keyring Eric Snowberg
2021-09-07 16:01 ` [PATCH v5 11/12] integrity: Trust MOK keys if MokListTrustedRT found Eric Snowberg
2021-09-07 16:01 ` [PATCH v5 12/12] integrity: Only use machine keyring when uefi_check_trust_mok_keys is true Eric Snowberg
2021-09-09 13:58   ` Jarkko Sakkinen
2021-09-08 16:03 ` [PATCH v5 00/12] Enroll kernel keys thru MOK Jarkko Sakkinen
2021-09-08 16:49   ` Jarkko Sakkinen
2021-09-08 22:25     ` Eric Snowberg
2021-09-09 13:02       ` Mimi Zohar
2021-09-08 17:09   ` Eric Snowberg

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=B34345FD-38F9-4722-B046-E250ACBD5B8C@oracle.com \
    --to=eric.snowberg@oracle.com \
    --cc=James.Bottomley@HansenPartnership.com \
    --cc=ardb@kernel.org \
    --cc=davem@davemloft.net \
    --cc=dhowells@redhat.com \
    --cc=dwmw2@infradead.org \
    --cc=ebiggers@google.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=herbert@gondor.apana.org.au \
    --cc=jarkko@kernel.org \
    --cc=jmorris@namei.org \
    --cc=keescook@chromium.org \
    --cc=keyrings@vger.kernel.org \
    --cc=konrad.wilk@oracle.com \
    --cc=linux-crypto@vger.kernel.org \
    --cc=linux-integrity@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-security-module@vger.kernel.org \
    --cc=lszubowi@redhat.com \
    --cc=nayna@linux.ibm.com \
    --cc=nramas@linux.microsoft.com \
    --cc=pjones@redhat.com \
    --cc=scott.branden@broadcom.com \
    --cc=serge@hallyn.com \
    --cc=torvalds@linux-foundation.org \
    --cc=weiyongjun1@huawei.com \
    --cc=zohar@linux.ibm.com \
    --subject='Re: [PATCH v5 04/12] integrity: restrict INTEGRITY_KEYRING_MACHINE to restrict_link_by_ca' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).