From: David Howells <dhowells@redhat.com> To: Mimi Zohar <zohar@linux.ibm.com> Cc: dhowells@redhat.com, Linus Torvalds <torvalds@linux-foundation.org>, James Morris <jmorris@namei.org>, keyrings@vger.kernel.org, Netdev <netdev@vger.kernel.org>, linux-nfs@vger.kernel.org, CIFS <linux-cifs@vger.kernel.org>, linux-afs@lists.infradead.org, linux-fsdevel <linux-fsdevel@vger.kernel.org>, linux-integrity@vger.kernel.org, LSM List <linux-security-module@vger.kernel.org>, Linux List Kernel Mailing <linux-kernel@vger.kernel.org> Subject: Re: [GIT PULL] Keys: Set 4 - Key ACLs for 5.3 Date: Fri, 16 Aug 2019 13:36:42 +0000 [thread overview] Message-ID: <23498.1565962602@warthog.procyon.org.uk> (raw) In-Reply-To: <1562814435.4014.11.camel@linux.ibm.com> Mimi Zohar <zohar@linux.ibm.com> wrote: > Sorry for the delay. An exception is needed for loading builtin keys > "KEY_ALLOC_BUILT_IN" onto a keyring that is not writable by userspace. > The following works, but probably is not how David would handle the > exception. I think the attached is the right way to fix it. load_system_certificate_list(), for example, when it creates keys does this: key = key_create_or_update(make_key_ref(builtin_trusted_keys, 1), marking the keyring as "possessed" in make_key_ref(). This allows the possessor permits to be used - and that's the *only* way to use them for internal keyrings like this because you can't link to them and you can't join them. David --- diff --git a/certs/system_keyring.c b/certs/system_keyring.c index 57be78b5fdfc..1f8f26f7bb05 100644 --- a/certs/system_keyring.c +++ b/certs/system_keyring.c @@ -99,7 +99,7 @@ static __init int system_trusted_keyring_init(void) builtin_trusted_keys keyring_alloc(".builtin_trusted_keys", KUIDT_INIT(0), KGIDT_INIT(0), current_cred(), - &internal_key_acl, KEY_ALLOC_NOT_IN_QUOTA, + &internal_keyring_acl, KEY_ALLOC_NOT_IN_QUOTA, NULL, NULL); if (IS_ERR(builtin_trusted_keys)) panic("Can't allocate builtin trusted keyring\n"); diff --git a/security/keys/permission.c b/security/keys/permission.c index fc84d9ef6239..86efd3eaf083 100644 --- a/security/keys/permission.c +++ b/security/keys/permission.c @@ -47,7 +47,7 @@ struct key_acl internal_keyring_acl = { .usage = REFCOUNT_INIT(1), .nr_ace = 2, .aces = { - KEY_POSSESSOR_ACE(KEY_ACE_SEARCH), + KEY_POSSESSOR_ACE(KEY_ACE_SEARCH | KEY_ACE_WRITE), KEY_OWNER_ACE(KEY_ACE_VIEW | KEY_ACE_READ | KEY_ACE_SEARCH), } };
WARNING: multiple messages have this Message-ID (diff)
From: David Howells <dhowells@redhat.com> To: Mimi Zohar <zohar@linux.ibm.com> Cc: dhowells@redhat.com, Linus Torvalds <torvalds@linux-foundation.org>, James Morris <jmorris@namei.org>, keyrings@vger.kernel.org, Netdev <netdev@vger.kernel.org>, linux-nfs@vger.kernel.org, CIFS <linux-cifs@vger.kernel.org>, linux-afs@lists.infradead.org, linux-fsdevel <linux-fsdevel@vger.kernel.org>, linux-integrity@vger.kernel.org, LSM List <linux-security-module@vger.kernel.org>, Linux List Kernel Mailing <linux-kernel@vger.kernel.org> Subject: Re: [GIT PULL] Keys: Set 4 - Key ACLs for 5.3 Date: Fri, 16 Aug 2019 14:36:42 +0100 [thread overview] Message-ID: <23498.1565962602@warthog.procyon.org.uk> (raw) In-Reply-To: <1562814435.4014.11.camel@linux.ibm.com> Mimi Zohar <zohar@linux.ibm.com> wrote: > Sorry for the delay. An exception is needed for loading builtin keys > "KEY_ALLOC_BUILT_IN" onto a keyring that is not writable by userspace. > The following works, but probably is not how David would handle the > exception. I think the attached is the right way to fix it. load_system_certificate_list(), for example, when it creates keys does this: key = key_create_or_update(make_key_ref(builtin_trusted_keys, 1), marking the keyring as "possessed" in make_key_ref(). This allows the possessor permits to be used - and that's the *only* way to use them for internal keyrings like this because you can't link to them and you can't join them. David --- diff --git a/certs/system_keyring.c b/certs/system_keyring.c index 57be78b5fdfc..1f8f26f7bb05 100644 --- a/certs/system_keyring.c +++ b/certs/system_keyring.c @@ -99,7 +99,7 @@ static __init int system_trusted_keyring_init(void) builtin_trusted_keys = keyring_alloc(".builtin_trusted_keys", KUIDT_INIT(0), KGIDT_INIT(0), current_cred(), - &internal_key_acl, KEY_ALLOC_NOT_IN_QUOTA, + &internal_keyring_acl, KEY_ALLOC_NOT_IN_QUOTA, NULL, NULL); if (IS_ERR(builtin_trusted_keys)) panic("Can't allocate builtin trusted keyring\n"); diff --git a/security/keys/permission.c b/security/keys/permission.c index fc84d9ef6239..86efd3eaf083 100644 --- a/security/keys/permission.c +++ b/security/keys/permission.c @@ -47,7 +47,7 @@ struct key_acl internal_keyring_acl = { .usage = REFCOUNT_INIT(1), .nr_ace = 2, .aces = { - KEY_POSSESSOR_ACE(KEY_ACE_SEARCH), + KEY_POSSESSOR_ACE(KEY_ACE_SEARCH | KEY_ACE_WRITE), KEY_OWNER_ACE(KEY_ACE_VIEW | KEY_ACE_READ | KEY_ACE_SEARCH), } };
next prev parent reply other threads:[~2019-08-16 13:36 UTC|newest] Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-07-05 21:30 [GIT PULL] Keys: Set 4 - Key ACLs for 5.3 David Howells 2019-07-05 21:30 ` David Howells 2019-07-09 3:15 ` pr-tracker-bot 2019-07-09 3:15 ` pr-tracker-bot 2019-07-10 18:35 ` Linus Torvalds 2019-07-10 18:35 ` Linus Torvalds 2019-07-10 19:46 ` Eric Biggers 2019-07-10 19:46 ` Eric Biggers 2019-07-10 20:15 ` Eric Biggers 2019-07-10 20:15 ` Eric Biggers 2019-07-11 1:59 ` Linus Torvalds 2019-07-11 1:59 ` Linus Torvalds 2019-07-11 3:07 ` Mimi Zohar 2019-07-11 3:07 ` Mimi Zohar 2019-08-16 13:36 ` David Howells [this message] 2019-08-16 13:36 ` David Howells 2019-08-21 14:20 ` Mimi Zohar 2019-08-21 14:20 ` Mimi Zohar 2019-08-21 15:43 ` Mimi Zohar 2019-08-21 15:43 ` Mimi Zohar 2019-08-21 19:22 ` David Howells 2019-08-21 19:22 ` David Howells
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=23498.1565962602@warthog.procyon.org.uk \ --to=dhowells@redhat.com \ --cc=jmorris@namei.org \ --cc=keyrings@vger.kernel.org \ --cc=linux-afs@lists.infradead.org \ --cc=linux-cifs@vger.kernel.org \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-integrity@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-nfs@vger.kernel.org \ --cc=linux-security-module@vger.kernel.org \ --cc=netdev@vger.kernel.org \ --cc=torvalds@linux-foundation.org \ --cc=zohar@linux.ibm.com \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.