From: Lakshmi Ramasubramanian <nramas@linux.microsoft.com> To: zohar@linux.ibm.com, dhowells@redhat.com, matthewgarrett@google.com, sashal@kernel.org, jamorris@linux.microsoft.com, linux-integrity@vger.kernel.org, linux-security-module@vger.kernel.org, keyrings@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v5 10/10] IMA: Call queue and dequeue functions to measure keys. Date: Mon, 11 Nov 2019 19:33:03 +0000 [thread overview] Message-ID: <20191111193303.12781-11-nramas@linux.microsoft.com> (raw) In-Reply-To: <20191111193303.12781-1-nramas@linux.microsoft.com> Keys should be queued for measurement if custom IMA policies have not been applied. Keys queued for measurement, if any, need to be processed when custom IMA policies have been applied. This patch adds the call to ima_queue_key_for_measurement in the IMA hook function and the call to ima_process_queued_keys_for_measurement when custom IMA policies have been applied. NOTE: If the kernel is built with CONFIG_IMA_MEASURE_ASYMMETRIC_KEYS then the IMA policy for measuring keys should be applied as part of custom IMA policies. Keys will be queued up until custom policies are applied and processed when applied. Signed-off-by: Lakshmi Ramasubramanian <nramas@linux.microsoft.com> --- security/integrity/ima/ima_asymmetric_keys.c | 31 ++++++++++++++++++-- security/integrity/ima/ima_policy.c | 12 ++++++++ 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/security/integrity/ima/ima_asymmetric_keys.c b/security/integrity/ima/ima_asymmetric_keys.c index 4a38b4957b8c..fab1d4672715 100644 --- a/security/integrity/ima/ima_asymmetric_keys.c +++ b/security/integrity/ima/ima_asymmetric_keys.c @@ -158,15 +158,42 @@ void ima_post_key_create_or_update(struct key *keyring, struct key *key, unsigned long flags, bool create) { const struct public_key *pk; + bool key_queued = false; - /* Only asymmetric keys are handled */ + /* Only asymmetric keys are handled by this hook. */ if (key->type != &key_type_asymmetric) return; + if (!ima_process_keys_for_measurement) + key_queued = ima_queue_key_for_measurement(keyring, key); + /* - * Get the public_key of the given asymmetric key to measure. + * Need to check again if the key was queued or not because + * ima_process_keys_for_measurement could have flipped from + * false to true after it was checked above, but before the key + * could be queued by ima_queue_key_for_measurement(). */ + if (key_queued) + return; + + /* Public key of the given asymmetric key is measured. */ pk = key->payload.data[asym_crypto]; + + /* + * keyring->description points to the name of the keyring + * (such as ".builtin_trusted_keys", ".ima", etc.) to + * which the given key is linked to. + * + * The name of the keyring is passed in the "eventname" + * parameter to process_buffer_measurement() and is set + * in the "eventname" field in ima_event_data for + * the key measurement IMA event. + * + * The name of the keyring is also passed in the "keyring" + * parameter to process_buffer_measurement() to check + * if the IMA policy is configured to measure a key linked + * to the given keyring. + */ process_buffer_measurement(pk->key, pk->keylen, keyring->description, KEYRING_CHECK, 0, diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c index d1889eee9287..d130bdcbc174 100644 --- a/security/integrity/ima/ima_policy.c +++ b/security/integrity/ima/ima_policy.c @@ -759,6 +759,18 @@ void ima_update_policy(void) kfree(arch_policy_entry); } ima_update_policy_flag(); + + /* + * Custom IMA policies have been setup. + * Process key(s) queued up for measurement now. + * + * NOTE: + * Custom IMA policies always overwrite builtin policies + * (policies compiled in code). If one wants measurement + * of asymmetric keys then it has to be configured in + * custom policies and updated here. + */ + ima_process_queued_keys_for_measurement(); } /* Keep the enumeration in sync with the policy_tokens! */ -- 2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: Lakshmi Ramasubramanian <nramas@linux.microsoft.com> To: zohar@linux.ibm.com, dhowells@redhat.com, matthewgarrett@google.com, sashal@kernel.org, jamorris@linux.microsoft.com, linux-integrity@vger.kernel.org, linux-security-module@vger.kernel.org, keyrings@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v5 10/10] IMA: Call queue and dequeue functions to measure keys. Date: Mon, 11 Nov 2019 11:33:03 -0800 [thread overview] Message-ID: <20191111193303.12781-11-nramas@linux.microsoft.com> (raw) In-Reply-To: <20191111193303.12781-1-nramas@linux.microsoft.com> Keys should be queued for measurement if custom IMA policies have not been applied. Keys queued for measurement, if any, need to be processed when custom IMA policies have been applied. This patch adds the call to ima_queue_key_for_measurement in the IMA hook function and the call to ima_process_queued_keys_for_measurement when custom IMA policies have been applied. NOTE: If the kernel is built with CONFIG_IMA_MEASURE_ASYMMETRIC_KEYS then the IMA policy for measuring keys should be applied as part of custom IMA policies. Keys will be queued up until custom policies are applied and processed when applied. Signed-off-by: Lakshmi Ramasubramanian <nramas@linux.microsoft.com> --- security/integrity/ima/ima_asymmetric_keys.c | 31 ++++++++++++++++++-- security/integrity/ima/ima_policy.c | 12 ++++++++ 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/security/integrity/ima/ima_asymmetric_keys.c b/security/integrity/ima/ima_asymmetric_keys.c index 4a38b4957b8c..fab1d4672715 100644 --- a/security/integrity/ima/ima_asymmetric_keys.c +++ b/security/integrity/ima/ima_asymmetric_keys.c @@ -158,15 +158,42 @@ void ima_post_key_create_or_update(struct key *keyring, struct key *key, unsigned long flags, bool create) { const struct public_key *pk; + bool key_queued = false; - /* Only asymmetric keys are handled */ + /* Only asymmetric keys are handled by this hook. */ if (key->type != &key_type_asymmetric) return; + if (!ima_process_keys_for_measurement) + key_queued = ima_queue_key_for_measurement(keyring, key); + /* - * Get the public_key of the given asymmetric key to measure. + * Need to check again if the key was queued or not because + * ima_process_keys_for_measurement could have flipped from + * false to true after it was checked above, but before the key + * could be queued by ima_queue_key_for_measurement(). */ + if (key_queued) + return; + + /* Public key of the given asymmetric key is measured. */ pk = key->payload.data[asym_crypto]; + + /* + * keyring->description points to the name of the keyring + * (such as ".builtin_trusted_keys", ".ima", etc.) to + * which the given key is linked to. + * + * The name of the keyring is passed in the "eventname" + * parameter to process_buffer_measurement() and is set + * in the "eventname" field in ima_event_data for + * the key measurement IMA event. + * + * The name of the keyring is also passed in the "keyring" + * parameter to process_buffer_measurement() to check + * if the IMA policy is configured to measure a key linked + * to the given keyring. + */ process_buffer_measurement(pk->key, pk->keylen, keyring->description, KEYRING_CHECK, 0, diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c index d1889eee9287..d130bdcbc174 100644 --- a/security/integrity/ima/ima_policy.c +++ b/security/integrity/ima/ima_policy.c @@ -759,6 +759,18 @@ void ima_update_policy(void) kfree(arch_policy_entry); } ima_update_policy_flag(); + + /* + * Custom IMA policies have been setup. + * Process key(s) queued up for measurement now. + * + * NOTE: + * Custom IMA policies always overwrite builtin policies + * (policies compiled in code). If one wants measurement + * of asymmetric keys then it has to be configured in + * custom policies and updated here. + */ + ima_process_queued_keys_for_measurement(); } /* Keep the enumeration in sync with the policy_tokens! */ -- 2.17.1
next prev parent reply other threads:[~2019-11-11 19:33 UTC|newest] Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-11-11 19:32 [PATCH v5 0/10] KEYS: Measure keys when they are created or updated Lakshmi Ramasubramanian 2019-11-11 19:32 ` Lakshmi Ramasubramanian 2019-11-11 19:32 ` [PATCH v5 01/10] IMA: Added KEYRING_CHECK func in IMA policy to measure keys Lakshmi Ramasubramanian 2019-11-11 19:32 ` Lakshmi Ramasubramanian 2019-11-12 17:04 ` Mimi Zohar 2019-11-12 17:04 ` Mimi Zohar 2019-11-12 17:37 ` Lakshmi Ramasubramanian 2019-11-12 17:37 ` Lakshmi Ramasubramanian 2019-11-11 19:32 ` [PATCH v5 02/10] IMA: Added keyrings= option in IMA policy to only measure keys added to the specifi Lakshmi Ramasubramanian 2019-11-11 19:32 ` [PATCH v5 02/10] IMA: Added keyrings= option in IMA policy to only measure keys added to the specified keyrings Lakshmi Ramasubramanian 2019-11-12 17:05 ` [PATCH v5 02/10] IMA: Added keyrings= option in IMA policy to only measure keys added to the spe Mimi Zohar 2019-11-12 17:05 ` [PATCH v5 02/10] IMA: Added keyrings= option in IMA policy to only measure keys added to the specified keyrings Mimi Zohar 2019-11-12 17:43 ` [PATCH v5 02/10] IMA: Added keyrings= option in IMA policy to only measure keys added to the spe Lakshmi Ramasubramanian 2019-11-12 17:43 ` [PATCH v5 02/10] IMA: Added keyrings= option in IMA policy to only measure keys added to the specified keyrings Lakshmi Ramasubramanian 2019-11-12 17:58 ` [PATCH v5 02/10] IMA: Added keyrings= option in IMA policy to only measure keys added to the spe Mimi Zohar 2019-11-12 17:58 ` [PATCH v5 02/10] IMA: Added keyrings= option in IMA policy to only measure keys added to the specified keyrings Mimi Zohar 2019-11-11 19:32 ` [PATCH v5 03/10] IMA: Read keyrings= option from the IMA policy into ima_rule_entry Lakshmi Ramasubramanian 2019-11-11 19:32 ` Lakshmi Ramasubramanian 2019-11-11 19:32 ` [PATCH v5 04/10] IMA: Updated IMA policy functions to return keyrings option read from the policy Lakshmi Ramasubramanian 2019-11-11 19:32 ` Lakshmi Ramasubramanian 2019-11-12 17:05 ` [PATCH v5 04/10] IMA: Updated IMA policy functions to return keyrings option read from the polic Mimi Zohar 2019-11-12 17:05 ` [PATCH v5 04/10] IMA: Updated IMA policy functions to return keyrings option read from the policy Mimi Zohar 2019-11-12 17:47 ` [PATCH v5 04/10] IMA: Updated IMA policy functions to return keyrings option read from the polic Lakshmi Ramasubramanian 2019-11-12 17:47 ` [PATCH v5 04/10] IMA: Updated IMA policy functions to return keyrings option read from the policy Lakshmi Ramasubramanian 2019-11-12 18:06 ` [PATCH v5 04/10] IMA: Updated IMA policy functions to return keyrings option read from the polic Mimi Zohar 2019-11-12 18:06 ` [PATCH v5 04/10] IMA: Updated IMA policy functions to return keyrings option read from the policy Mimi Zohar 2019-11-11 19:32 ` [PATCH v5 05/10] IMA: Measure key if the IMA policy allows measurement for the keyring to which the Lakshmi Ramasubramanian 2019-11-11 19:32 ` [PATCH v5 05/10] IMA: Measure key if the IMA policy allows measurement for the keyring to which the key is linked to Lakshmi Ramasubramanian 2019-11-11 19:32 ` [PATCH v5 06/10] IMA: Defined an IMA hook to measure keys on key create or update Lakshmi Ramasubramanian 2019-11-11 19:32 ` Lakshmi Ramasubramanian 2019-11-11 19:33 ` [PATCH v5 07/10] KEYS: Call the IMA hook to measure key when a new key is created or an existing key Lakshmi Ramasubramanian 2019-11-11 19:33 ` [PATCH v5 07/10] KEYS: Call the IMA hook to measure key when a new key is created or an existing key is updated Lakshmi Ramasubramanian 2019-11-11 19:33 ` [PATCH v5 08/10] IMA: Added a flag to determine whether IMA hook can process the key now or has to q Lakshmi Ramasubramanian 2019-11-11 19:33 ` [PATCH v5 08/10] IMA: Added a flag to determine whether IMA hook can process the key now or has to queue for processing later Lakshmi Ramasubramanian 2019-11-11 19:33 ` [PATCH v5 09/10] IMA: Defined functions to queue and dequeue keys for measurement Lakshmi Ramasubramanian 2019-11-11 19:33 ` Lakshmi Ramasubramanian 2019-11-11 19:33 ` Lakshmi Ramasubramanian [this message] 2019-11-11 19:33 ` [PATCH v5 10/10] IMA: Call queue and dequeue functions to measure keys Lakshmi Ramasubramanian 2019-11-11 19:41 ` [PATCH v5 0/10] KEYS: Measure keys when they are created or updated Lakshmi Ramasubramanian 2019-11-11 19:41 ` Lakshmi Ramasubramanian 2019-11-12 17:08 ` Mimi Zohar 2019-11-12 17:08 ` Mimi Zohar 2019-11-12 17:52 ` Lakshmi Ramasubramanian 2019-11-12 17:52 ` Lakshmi Ramasubramanian
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=20191111193303.12781-11-nramas@linux.microsoft.com \ --to=nramas@linux.microsoft.com \ --cc=dhowells@redhat.com \ --cc=jamorris@linux.microsoft.com \ --cc=keyrings@vger.kernel.org \ --cc=linux-integrity@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-security-module@vger.kernel.org \ --cc=matthewgarrett@google.com \ --cc=sashal@kernel.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.