mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Roberto Sassu <roberto.sassu@huawei.com>
To: <zohar@linux.ibm.com>, <rgoldwyn@suse.de>
Cc: <linux-integrity@vger.kernel.org>,
	<linux-security-module@vger.kernel.org>,
	<linux-kernel@vger.kernel.org>, <silviu.vlasceanu@huawei.com>,
	<krzysztof.struczynski@huawei.com>,
	"Roberto Sassu" <roberto.sassu@huawei.com>,
	<stable@vger.kernel.org>
Subject: [PATCH v2 6/6] ima: Fix return value of ima_write_policy()
Date: Mon, 27 Apr 2020 12:31:28 +0200	[thread overview]
Message-ID: <20200427103128.19229-1-roberto.sassu@huawei.com> (raw)
In-Reply-To: <20200427102900.18887-1-roberto.sassu@huawei.com>

This patch fixes the return value of ima_write_policy() when a new policy
is directly passed to IMA and the current policy requires appraisal of the
file containing the policy. Currently, if appraisal is not in ENFORCE mode,
ima_write_policy() returns 0 and leads user space applications to an
endless loop. Fix this issue by denying the operation regardless of the
appraisal mode.

Changelog

v1:
- deny the operation in all cases (suggested by Mimi, Krzysztof)

Cc: stable@vger.kernel.org # 4.10.x
Fixes: 19f8a84713edc ("ima: measure and appraise the IMA policy itself")
Signed-off-by: Roberto Sassu <roberto.sassu@huawei.com>
---
 security/integrity/ima/ima_fs.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/security/integrity/ima/ima_fs.c b/security/integrity/ima/ima_fs.c
index 8b030a1c5e0d..e3fcad871861 100644
--- a/security/integrity/ima/ima_fs.c
+++ b/security/integrity/ima/ima_fs.c
@@ -338,8 +338,7 @@ static ssize_t ima_write_policy(struct file *file, const char __user *buf,
 		integrity_audit_msg(AUDIT_INTEGRITY_STATUS, NULL, NULL,
 				    "policy_update", "signed policy required",
 				    1, 0);
-		if (ima_appraise & IMA_APPRAISE_ENFORCE)
-			result = -EACCES;
+		result = -EACCES;
 	} else {
 		result = ima_parse_add_rule(data);
 	}
-- 
2.17.1


  parent reply	other threads:[~2020-04-27 10:34 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-27 10:28 [PATCH v2 1/6] ima: Set file->f_mode instead of file->f_flags in ima_calc_file_hash() Roberto Sassu
2020-04-27 10:28 ` [PATCH v2 2/6] evm: Check also if *tfm is an error pointer in init_desc() Roberto Sassu
2020-04-27 10:28 ` [PATCH v2 3/6] ima: Fix ima digest hash table key calculation Roberto Sassu
2020-04-27 11:00   ` David Laight
2020-04-27 12:50     ` Roberto Sassu
2020-04-27 14:28       ` David Laight
2020-04-28  7:19         ` Roberto Sassu
2020-04-28  7:30   ` [RESEND][PATCH " Roberto Sassu
2020-04-30  8:03     ` David Laight
2020-04-27 10:28 ` [PATCH v2 4/6] ima: Remove redundant policy rule set in add_rules() Roberto Sassu
2020-04-27 10:28 ` [PATCH v2 5/6] ima: Set again build_ima_appraise variable Roberto Sassu
2020-04-27 10:31 ` Roberto Sassu [this message]
2020-04-28 17:46   ` [PATCH v2 6/6] ima: Fix return value of ima_write_policy() Mimi Zohar
2020-04-29  6:43     ` Krzysztof Struczynski
2020-04-27 13:42 ` [PATCH v2 1/6] ima: Set file->f_mode instead of file->f_flags in ima_calc_file_hash() Goldwyn Rodrigues

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=20200427103128.19229-1-roberto.sassu@huawei.com \
    --to=roberto.sassu@huawei.com \
    --cc=krzysztof.struczynski@huawei.com \
    --cc=linux-integrity@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-security-module@vger.kernel.org \
    --cc=rgoldwyn@suse.de \
    --cc=silviu.vlasceanu@huawei.com \
    --cc=stable@vger.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: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®