From: Mimi Zohar <zohar@linux.ibm.com>
To: Lakshmi Ramasubramanian <nramas@linux.microsoft.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: Re: [PATCH v5 04/10] IMA: Updated IMA policy functions to return keyrings option read from the polic
Date: Tue, 12 Nov 2019 17:05:16 +0000 [thread overview]
Message-ID: <1573578316.17949.43.camel@linux.ibm.com> (raw)
In-Reply-To: <20191111193303.12781-5-nramas@linux.microsoft.com>
On Mon, 2019-11-11 at 11:32 -0800, Lakshmi Ramasubramanian wrote:
> diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c
> index 1aee3c8b9cf6..d1889eee9287 100644
> --- a/security/integrity/ima/ima_policy.c
> +++ b/security/integrity/ima/ima_policy.c
> @@ -481,6 +481,7 @@ static int get_subaction(struct ima_rule_entry *rule, enum ima_hooks func)
> * @mask: requested action (MAY_READ | MAY_WRITE | MAY_APPEND | MAY_EXEC)
> * @pcr: set the pcr to extend
> * @template_desc: the template that should be used for this rule
> + * @keyrings: set the keyrings for this rule, if specified
> *
> * Measure decision based on func/mask/fsmagic and LSM(subj/obj/type)
> * conditions.
> @@ -491,7 +492,8 @@ static int get_subaction(struct ima_rule_entry *rule, enum ima_hooks func)
> */
> int ima_match_policy(struct inode *inode, const struct cred *cred, u32 secid,
> enum ima_hooks func, int mask, int flags, int *pcr,
> - struct ima_template_desc **template_desc)
> + struct ima_template_desc **template_desc,
> + char **keyrings)
> {
> struct ima_rule_entry *entry;
> int action = 0, actmask = flags | (flags << 1);
> @@ -527,6 +529,9 @@ int ima_match_policy(struct inode *inode, const struct cred *cred, u32 secid,
> if ((pcr) && (entry->flags & IMA_PCR))
> *pcr = entry->pcr;
>
> + if ((keyrings) && (entry->flags & IMA_KEYRINGS))
> + *keyrings = entry->keyrings;
ima_match_rules() determines whether the rule is in policy or not. It
returns true on rule match, false on failure. There's no need to
return the list of keyrings.
Mimi
> +
> if (template_desc && entry->template)
> *template_desc = entry->template;
>
WARNING: multiple messages have this Message-ID (diff)
From: Mimi Zohar <zohar@linux.ibm.com>
To: Lakshmi Ramasubramanian <nramas@linux.microsoft.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: Re: [PATCH v5 04/10] IMA: Updated IMA policy functions to return keyrings option read from the policy
Date: Tue, 12 Nov 2019 12:05:16 -0500 [thread overview]
Message-ID: <1573578316.17949.43.camel@linux.ibm.com> (raw)
In-Reply-To: <20191111193303.12781-5-nramas@linux.microsoft.com>
On Mon, 2019-11-11 at 11:32 -0800, Lakshmi Ramasubramanian wrote:
> diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c
> index 1aee3c8b9cf6..d1889eee9287 100644
> --- a/security/integrity/ima/ima_policy.c
> +++ b/security/integrity/ima/ima_policy.c
> @@ -481,6 +481,7 @@ static int get_subaction(struct ima_rule_entry *rule, enum ima_hooks func)
> * @mask: requested action (MAY_READ | MAY_WRITE | MAY_APPEND | MAY_EXEC)
> * @pcr: set the pcr to extend
> * @template_desc: the template that should be used for this rule
> + * @keyrings: set the keyrings for this rule, if specified
> *
> * Measure decision based on func/mask/fsmagic and LSM(subj/obj/type)
> * conditions.
> @@ -491,7 +492,8 @@ static int get_subaction(struct ima_rule_entry *rule, enum ima_hooks func)
> */
> int ima_match_policy(struct inode *inode, const struct cred *cred, u32 secid,
> enum ima_hooks func, int mask, int flags, int *pcr,
> - struct ima_template_desc **template_desc)
> + struct ima_template_desc **template_desc,
> + char **keyrings)
> {
> struct ima_rule_entry *entry;
> int action = 0, actmask = flags | (flags << 1);
> @@ -527,6 +529,9 @@ int ima_match_policy(struct inode *inode, const struct cred *cred, u32 secid,
> if ((pcr) && (entry->flags & IMA_PCR))
> *pcr = entry->pcr;
>
> + if ((keyrings) && (entry->flags & IMA_KEYRINGS))
> + *keyrings = entry->keyrings;
ima_match_rules() determines whether the rule is in policy or not. It
returns true on rule match, false on failure. There's no need to
return the list of keyrings.
Mimi
> +
> if (template_desc && entry->template)
> *template_desc = entry->template;
>
next prev parent reply other threads:[~2019-11-12 17:05 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 ` Mimi Zohar [this message]
2019-11-12 17:05 ` 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 ` [PATCH v5 10/10] IMA: Call queue and dequeue functions to measure keys Lakshmi Ramasubramanian
2019-11-11 19:33 ` 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=1573578316.17949.43.camel@linux.ibm.com \
--to=zohar@linux.ibm.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=nramas@linux.microsoft.com \
--cc=sashal@kernel.org \
/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
Be 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.