All of lore.kernel.org
 help / color / mirror / Atom feed
From: Thiago Jung Bauermann <bauerman@linux.ibm.com>
To: linux-integrity@vger.kernel.org
Cc: linux-security-module@vger.kernel.org, keyrings@vger.kernel.org,
	linux-crypto@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,
	linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org,
	Mimi Zohar <zohar@linux.ibm.com>,
	Dmitry Kasatkin <dmitry.kasatkin@gmail.com>,
	James Morris <jmorris@namei.org>,
	"Serge E. Hallyn" <serge@hallyn.com>,
	David Howells <dhowells@redhat.com>,
	David Woodhouse <dwmw2@infradead.org>,
	Jessica Yu <jeyu@kernel.org>,
	Herbert Xu <herbert@gondor.apana.org.au>,
	"David S. Miller" <davem@davemloft.net>,
	Jonathan Corbet <corbet@lwn.net>,
	"AKASHI, Takahiro" <takahiro.akashi@linaro.org>,
	Thiago Jung Bauermann <bauerman@linux.ibm.com>
Subject: [PATCH v11 13/13] ima: Allow template= option for appraise rules as well
Date: Tue, 11 Jun 2019 06:28:17 +0000	[thread overview]
Message-ID: <20190611062817.18412-14-bauerman@linux.ibm.com> (raw)
In-Reply-To: <20190611062817.18412-1-bauerman@linux.ibm.com>

It's useful being able to specify a different IMA template on appraise
policy rules, so allow it.

Signed-off-by: Thiago Jung Bauermann <bauerman@linux.ibm.com>
Suggested-by: Mimi Zohar <zohar@linux.ibm.com>
---
 security/integrity/ima/ima_policy.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c
index 6463ab8921ea..1ac1ef458f2e 100644
--- a/security/integrity/ima/ima_policy.c
+++ b/security/integrity/ima/ima_policy.c
@@ -1110,7 +1110,8 @@ static int ima_parse_rule(char *rule, struct ima_rule_entry *entry)
 			break;
 		case Opt_template:
 			ima_log_string(ab, "template", args[0].from);
-			if (entry->action != MEASURE) {
+			if (entry->action != MEASURE &&
+			    entry->action != APPRAISE) {
 				result = -EINVAL;
 				break;
 			}

WARNING: multiple messages have this Message-ID (diff)
From: Thiago Jung Bauermann <bauerman@linux.ibm.com>
To: linux-integrity@vger.kernel.org
Cc: linux-security-module@vger.kernel.org, keyrings@vger.kernel.org,
	linux-crypto@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,
	linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org,
	Mimi Zohar <zohar@linux.ibm.com>,
	Dmitry Kasatkin <dmitry.kasatkin@gmail.com>,
	James Morris <jmorris@namei.org>,
	"Serge E. Hallyn" <serge@hallyn.com>,
	David Howells <dhowells@redhat.com>,
	David Woodhouse <dwmw2@infradead.org>,
	Jessica Yu <jeyu@kernel.org>,
	Herbert Xu <herbert@gondor.apana.org.au>,
	"David S. Miller" <davem@davemloft.net>,
	Jonathan Corbet <corbet@lwn.net>,
	"AKASHI, Takahiro" <takahiro.akashi@linaro.org>,
	Thiago Jung Bauermann <bauerman@linux.ibm.com>
Subject: [PATCH v11 13/13] ima: Allow template= option for appraise rules as well
Date: Tue, 11 Jun 2019 03:28:17 -0300	[thread overview]
Message-ID: <20190611062817.18412-14-bauerman@linux.ibm.com> (raw)
In-Reply-To: <20190611062817.18412-1-bauerman@linux.ibm.com>

It's useful being able to specify a different IMA template on appraise
policy rules, so allow it.

Signed-off-by: Thiago Jung Bauermann <bauerman@linux.ibm.com>
Suggested-by: Mimi Zohar <zohar@linux.ibm.com>
---
 security/integrity/ima/ima_policy.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c
index 6463ab8921ea..1ac1ef458f2e 100644
--- a/security/integrity/ima/ima_policy.c
+++ b/security/integrity/ima/ima_policy.c
@@ -1110,7 +1110,8 @@ static int ima_parse_rule(char *rule, struct ima_rule_entry *entry)
 			break;
 		case Opt_template:
 			ima_log_string(ab, "template", args[0].from);
-			if (entry->action != MEASURE) {
+			if (entry->action != MEASURE &&
+			    entry->action != APPRAISE) {
 				result = -EINVAL;
 				break;
 			}


WARNING: multiple messages have this Message-ID (diff)
From: Thiago Jung Bauermann <bauerman@linux.ibm.com>
To: linux-integrity@vger.kernel.org
Cc: Herbert Xu <herbert@gondor.apana.org.au>,
	linux-doc@vger.kernel.org,
	Dmitry Kasatkin <dmitry.kasatkin@gmail.com>,
	"David S. Miller" <davem@davemloft.net>,
	Jonathan Corbet <corbet@lwn.net>,
	linux-kernel@vger.kernel.org, Mimi Zohar <zohar@linux.ibm.com>,
	James Morris <jmorris@namei.org>,
	David Howells <dhowells@redhat.com>,
	"AKASHI, Takahiro" <takahiro.akashi@linaro.org>,
	linux-security-module@vger.kernel.org, keyrings@vger.kernel.org,
	linux-crypto@vger.kernel.org, Jessica Yu <jeyu@kernel.org>,
	linuxppc-dev@lists.ozlabs.org,
	David Woodhouse <dwmw2@infradead.org>,
	Thiago Jung Bauermann <bauerman@linux.ibm.com>,
	"Serge E. Hallyn" <serge@hallyn.com>
Subject: [PATCH v11 13/13] ima: Allow template= option for appraise rules as well
Date: Tue, 11 Jun 2019 03:28:17 -0300	[thread overview]
Message-ID: <20190611062817.18412-14-bauerman@linux.ibm.com> (raw)
In-Reply-To: <20190611062817.18412-1-bauerman@linux.ibm.com>

It's useful being able to specify a different IMA template on appraise
policy rules, so allow it.

Signed-off-by: Thiago Jung Bauermann <bauerman@linux.ibm.com>
Suggested-by: Mimi Zohar <zohar@linux.ibm.com>
---
 security/integrity/ima/ima_policy.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c
index 6463ab8921ea..1ac1ef458f2e 100644
--- a/security/integrity/ima/ima_policy.c
+++ b/security/integrity/ima/ima_policy.c
@@ -1110,7 +1110,8 @@ static int ima_parse_rule(char *rule, struct ima_rule_entry *entry)
 			break;
 		case Opt_template:
 			ima_log_string(ab, "template", args[0].from);
-			if (entry->action != MEASURE) {
+			if (entry->action != MEASURE &&
+			    entry->action != APPRAISE) {
 				result = -EINVAL;
 				break;
 			}


  parent reply	other threads:[~2019-06-11  6:28 UTC|newest]

Thread overview: 48+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-06-11  6:28 [PATCH v11 00/13] Appended signatures support for IMA appraisal Thiago Jung Bauermann
2019-06-11  6:28 ` Thiago Jung Bauermann
2019-06-11  6:28 ` Thiago Jung Bauermann
2019-06-11  6:28 ` [PATCH v11 01/13] MODSIGN: Export module signature definitions Thiago Jung Bauermann
2019-06-11  6:28   ` Thiago Jung Bauermann
2019-06-11  6:28   ` Thiago Jung Bauermann
2019-06-24 19:52   ` Thiago Jung Bauermann
2019-06-24 19:52     ` Thiago Jung Bauermann
2019-06-24 19:52     ` Thiago Jung Bauermann
2019-06-11  6:28 ` [PATCH v11 02/13] PKCS#7: Refactor verify_pkcs7_signature() Thiago Jung Bauermann
2019-06-11  6:28   ` Thiago Jung Bauermann
2019-06-11  6:28   ` Thiago Jung Bauermann
2019-06-24 19:56   ` Thiago Jung Bauermann
2019-06-24 19:56     ` Thiago Jung Bauermann
2019-06-24 19:56     ` Thiago Jung Bauermann
2019-06-11  6:28 ` [PATCH v11 03/13] PKCS#7: Introduce pkcs7_get_digest() Thiago Jung Bauermann
2019-06-11  6:28   ` Thiago Jung Bauermann
2019-06-11  6:28   ` Thiago Jung Bauermann
2019-06-11  6:28 ` [PATCH v11 04/13] integrity: Introduce struct evm_xattr Thiago Jung Bauermann
2019-06-11  6:28   ` Thiago Jung Bauermann
2019-06-11  6:28   ` Thiago Jung Bauermann
2019-06-11  6:28 ` [PATCH v11 05/13] integrity: Select CONFIG_KEYS instead of depending on it Thiago Jung Bauermann
2019-06-11  6:28   ` Thiago Jung Bauermann
2019-06-11  6:28   ` Thiago Jung Bauermann
2019-06-11  6:28 ` [PATCH v11 06/13] ima: Use designated initializers for struct ima_event_data Thiago Jung Bauermann
2019-06-11  6:28   ` Thiago Jung Bauermann
2019-06-11  6:28   ` Thiago Jung Bauermann
2019-06-11  6:28 ` [PATCH v11 07/13] ima: Add modsig appraise_type option for module-style appended signatures Thiago Jung Bauermann
2019-06-11  6:28   ` Thiago Jung Bauermann
2019-06-11  6:28   ` Thiago Jung Bauermann
2019-06-11  6:28 ` [PATCH v11 08/13] ima: Factor xattr_verify() out of ima_appraise_measurement() Thiago Jung Bauermann
2019-06-11  6:28   ` Thiago Jung Bauermann
2019-06-11  6:28   ` Thiago Jung Bauermann
2019-06-11  6:28 ` [PATCH v11 09/13] ima: Implement support for module-style appended signatures Thiago Jung Bauermann
2019-06-11  6:28   ` Thiago Jung Bauermann
2019-06-11  6:28   ` Thiago Jung Bauermann
2019-06-11  6:28 ` [PATCH v11 10/13] ima: Collect modsig Thiago Jung Bauermann
2019-06-11  6:28   ` Thiago Jung Bauermann
2019-06-11  6:28   ` Thiago Jung Bauermann
2019-06-11  6:28 ` [PATCH v11 11/13] ima: Define ima-modsig template Thiago Jung Bauermann
2019-06-11  6:28   ` Thiago Jung Bauermann
2019-06-11  6:28   ` Thiago Jung Bauermann
2019-06-11  6:28 ` [PATCH v11 12/13] ima: Store the measurement again when appraising a modsig Thiago Jung Bauermann
2019-06-11  6:28   ` Thiago Jung Bauermann
2019-06-11  6:28   ` Thiago Jung Bauermann
2019-06-11  6:28 ` Thiago Jung Bauermann [this message]
2019-06-11  6:28   ` [PATCH v11 13/13] ima: Allow template= option for appraise rules as well Thiago Jung Bauermann
2019-06-11  6:28   ` Thiago Jung Bauermann

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=20190611062817.18412-14-bauerman@linux.ibm.com \
    --to=bauerman@linux.ibm.com \
    --cc=corbet@lwn.net \
    --cc=davem@davemloft.net \
    --cc=dhowells@redhat.com \
    --cc=dmitry.kasatkin@gmail.com \
    --cc=dwmw2@infradead.org \
    --cc=herbert@gondor.apana.org.au \
    --cc=jeyu@kernel.org \
    --cc=jmorris@namei.org \
    --cc=keyrings@vger.kernel.org \
    --cc=linux-crypto@vger.kernel.org \
    --cc=linux-doc@vger.kernel.org \
    --cc=linux-integrity@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-security-module@vger.kernel.org \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=serge@hallyn.com \
    --cc=takahiro.akashi@linaro.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: 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.