From: Roberto Sassu <roberto.sassu@huawei.com> To: <linux-integrity@vger.kernel.org> Cc: <linux-security-module@vger.kernel.org>, <linux-fsdevel@vger.kernel.org>, <linux-doc@vger.kernel.org>, <linux-kernel@vger.kernel.org>, <silviu.vlasceanu@huawei.com>, Roberto Sassu <roberto.sassu@huawei.com> Subject: [PATCH v2 02/15] ima: generalize ima_write_policy() Date: Tue, 7 Nov 2017 11:36:57 +0100 [thread overview] Message-ID: <20171107103710.10883-3-roberto.sassu@huawei.com> (raw) In-Reply-To: <20171107103710.10883-1-roberto.sassu@huawei.com> This patch renames ima_write_policy() to ima_write_data(). Also, it determines the kernel_read_file_id from the dentry associated to the file, and passes it to ima_read_file(). Signed-off-by: Roberto Sassu <roberto.sassu@huawei.com> --- security/integrity/ima/ima_fs.c | 55 ++++++++++++++++++++++++++--------------- 1 file changed, 35 insertions(+), 20 deletions(-) diff --git a/security/integrity/ima/ima_fs.c b/security/integrity/ima/ima_fs.c index 27de4558303e..864d34581081 100644 --- a/security/integrity/ima/ima_fs.c +++ b/security/integrity/ima/ima_fs.c @@ -28,6 +28,21 @@ static DEFINE_MUTEX(ima_write_mutex); +static struct dentry *ima_dir; +static struct dentry *binary_runtime_measurements; +static struct dentry *ascii_runtime_measurements; +static struct dentry *runtime_measurements_count; +static struct dentry *violations; +static struct dentry *ima_policy; + +static enum kernel_read_file_id ima_get_file_id(struct dentry *dentry) +{ + if (dentry == ima_policy) + return READING_POLICY; + + return READING_UNKNOWN; +} + bool ima_canonical_fmt; static int __init default_canonical_fmt_setup(char *str) { @@ -315,11 +330,12 @@ static ssize_t ima_read_file(char *path, enum kernel_read_file_id file_id) return pathlen; } -static ssize_t ima_write_policy(struct file *file, const char __user *buf, - size_t datalen, loff_t *ppos) +static ssize_t ima_write_data(struct file *file, const char __user *buf, + size_t datalen, loff_t *ppos) { char *data; ssize_t result; + enum kernel_read_file_id file_id = ima_get_file_id(file->f_path.dentry); if (datalen >= PAGE_SIZE) datalen = PAGE_SIZE - 1; @@ -340,34 +356,33 @@ static ssize_t ima_write_policy(struct file *file, const char __user *buf, goto out_free; if (data[0] == '/') { - result = ima_read_file(data, READING_POLICY); - } else if (ima_appraise & IMA_APPRAISE_POLICY) { - pr_err("IMA: signed policy file (specified as an absolute pathname) required\n"); - integrity_audit_msg(AUDIT_INTEGRITY_STATUS, NULL, NULL, - "policy_update", "signed policy required", - 1, 0); - if (ima_appraise & IMA_APPRAISE_ENFORCE) - result = -EACCES; + result = ima_read_file(data, file_id); + } else if (file_id == READING_POLICY) { + if (ima_appraise & IMA_APPRAISE_POLICY) { + pr_err("IMA: signed policy file (specified " + "as an absolute pathname) required\n"); + integrity_audit_msg(AUDIT_INTEGRITY_STATUS, NULL, NULL, + "policy_update", "signed policy required", + 1, 0); + if (ima_appraise & IMA_APPRAISE_ENFORCE) + result = -EACCES; + } else { + result = ima_parse_add_rule(data); + } } else { - result = ima_parse_add_rule(data); + pr_err("Unknown data type\n"); + result = -EINVAL; } mutex_unlock(&ima_write_mutex); out_free: kfree(data); out: - if (result < 0) + if (file_id == READING_POLICY && result < 0) valid_policy = 0; return result; } -static struct dentry *ima_dir; -static struct dentry *binary_runtime_measurements; -static struct dentry *ascii_runtime_measurements; -static struct dentry *runtime_measurements_count; -static struct dentry *violations; -static struct dentry *ima_policy; - enum ima_fs_flags { IMA_FS_BUSY, }; @@ -446,7 +461,7 @@ static int ima_release_policy(struct inode *inode, struct file *file) static const struct file_operations ima_measure_policy_ops = { .open = ima_open_policy, - .write = ima_write_policy, + .write = ima_write_data, .read = seq_read, .release = ima_release_policy, .llseek = generic_file_llseek, -- 2.11.0
WARNING: multiple messages have this Message-ID (diff)
From: roberto.sassu@huawei.com (Roberto Sassu) To: linux-security-module@vger.kernel.org Subject: [PATCH v2 02/15] ima: generalize ima_write_policy() Date: Tue, 7 Nov 2017 11:36:57 +0100 [thread overview] Message-ID: <20171107103710.10883-3-roberto.sassu@huawei.com> (raw) In-Reply-To: <20171107103710.10883-1-roberto.sassu@huawei.com> This patch renames ima_write_policy() to ima_write_data(). Also, it determines the kernel_read_file_id from the dentry associated to the file, and passes it to ima_read_file(). Signed-off-by: Roberto Sassu <roberto.sassu@huawei.com> --- security/integrity/ima/ima_fs.c | 55 ++++++++++++++++++++++++++--------------- 1 file changed, 35 insertions(+), 20 deletions(-) diff --git a/security/integrity/ima/ima_fs.c b/security/integrity/ima/ima_fs.c index 27de4558303e..864d34581081 100644 --- a/security/integrity/ima/ima_fs.c +++ b/security/integrity/ima/ima_fs.c @@ -28,6 +28,21 @@ static DEFINE_MUTEX(ima_write_mutex); +static struct dentry *ima_dir; +static struct dentry *binary_runtime_measurements; +static struct dentry *ascii_runtime_measurements; +static struct dentry *runtime_measurements_count; +static struct dentry *violations; +static struct dentry *ima_policy; + +static enum kernel_read_file_id ima_get_file_id(struct dentry *dentry) +{ + if (dentry == ima_policy) + return READING_POLICY; + + return READING_UNKNOWN; +} + bool ima_canonical_fmt; static int __init default_canonical_fmt_setup(char *str) { @@ -315,11 +330,12 @@ static ssize_t ima_read_file(char *path, enum kernel_read_file_id file_id) return pathlen; } -static ssize_t ima_write_policy(struct file *file, const char __user *buf, - size_t datalen, loff_t *ppos) +static ssize_t ima_write_data(struct file *file, const char __user *buf, + size_t datalen, loff_t *ppos) { char *data; ssize_t result; + enum kernel_read_file_id file_id = ima_get_file_id(file->f_path.dentry); if (datalen >= PAGE_SIZE) datalen = PAGE_SIZE - 1; @@ -340,34 +356,33 @@ static ssize_t ima_write_policy(struct file *file, const char __user *buf, goto out_free; if (data[0] == '/') { - result = ima_read_file(data, READING_POLICY); - } else if (ima_appraise & IMA_APPRAISE_POLICY) { - pr_err("IMA: signed policy file (specified as an absolute pathname) required\n"); - integrity_audit_msg(AUDIT_INTEGRITY_STATUS, NULL, NULL, - "policy_update", "signed policy required", - 1, 0); - if (ima_appraise & IMA_APPRAISE_ENFORCE) - result = -EACCES; + result = ima_read_file(data, file_id); + } else if (file_id == READING_POLICY) { + if (ima_appraise & IMA_APPRAISE_POLICY) { + pr_err("IMA: signed policy file (specified " + "as an absolute pathname) required\n"); + integrity_audit_msg(AUDIT_INTEGRITY_STATUS, NULL, NULL, + "policy_update", "signed policy required", + 1, 0); + if (ima_appraise & IMA_APPRAISE_ENFORCE) + result = -EACCES; + } else { + result = ima_parse_add_rule(data); + } } else { - result = ima_parse_add_rule(data); + pr_err("Unknown data type\n"); + result = -EINVAL; } mutex_unlock(&ima_write_mutex); out_free: kfree(data); out: - if (result < 0) + if (file_id == READING_POLICY && result < 0) valid_policy = 0; return result; } -static struct dentry *ima_dir; -static struct dentry *binary_runtime_measurements; -static struct dentry *ascii_runtime_measurements; -static struct dentry *runtime_measurements_count; -static struct dentry *violations; -static struct dentry *ima_policy; - enum ima_fs_flags { IMA_FS_BUSY, }; @@ -446,7 +461,7 @@ static int ima_release_policy(struct inode *inode, struct file *file) static const struct file_operations ima_measure_policy_ops = { .open = ima_open_policy, - .write = ima_write_policy, + .write = ima_write_data, .read = seq_read, .release = ima_release_policy, .llseek = generic_file_llseek, -- 2.11.0 -- To unsubscribe from this list: send the line "unsubscribe linux-security-module" in the body of a message to majordomo at vger.kernel.org More majordomo info@ http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2017-11-07 10:40 UTC|newest] Thread overview: 96+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-11-07 10:36 [PATCH v2 00/15] ima: digest list feature Roberto Sassu 2017-11-07 10:36 ` Roberto Sassu 2017-11-07 10:36 ` [PATCH v2 01/15] ima: generalize ima_read_policy() Roberto Sassu 2017-11-07 10:36 ` Roberto Sassu 2017-11-07 10:36 ` Roberto Sassu [this message] 2017-11-07 10:36 ` [PATCH v2 02/15] ima: generalize ima_write_policy() Roberto Sassu 2017-11-07 10:36 ` [PATCH v2 03/15] ima: generalize policy file operations Roberto Sassu 2017-11-07 10:36 ` Roberto Sassu 2017-11-07 10:36 ` [PATCH v2 04/15] ima: use ima_show_htable_value to show hash table data Roberto Sassu 2017-11-07 10:36 ` Roberto Sassu 2017-11-07 10:37 ` [PATCH v2 05/15] ima: add functions to manage digest lists Roberto Sassu 2017-11-07 10:37 ` Roberto Sassu 2017-11-07 10:37 ` [PATCH v2 06/15] ima: add parser of digest lists metadata Roberto Sassu 2017-11-07 10:37 ` Roberto Sassu 2017-11-18 4:20 ` Serge E. Hallyn 2017-11-18 4:20 ` Serge E. Hallyn 2017-11-18 23:23 ` Mimi Zohar 2017-11-18 23:23 ` Mimi Zohar 2017-11-20 9:40 ` Roberto Sassu 2017-11-20 9:40 ` Roberto Sassu 2017-11-20 13:53 ` Mimi Zohar 2017-11-20 13:53 ` Mimi Zohar 2017-11-20 13:53 ` Mimi Zohar 2017-11-20 16:52 ` Serge E. Hallyn 2017-11-20 16:52 ` Serge E. Hallyn 2017-11-20 16:52 ` Serge E. Hallyn 2017-11-20 16:52 ` Serge E. Hallyn 2017-11-07 10:37 ` [PATCH v2 07/15] ima: add parser of compact digest list Roberto Sassu 2017-11-07 10:37 ` Roberto Sassu 2017-11-07 10:37 ` [PATCH v2 08/15] ima: add parser of RPM package headers Roberto Sassu 2017-11-07 10:37 ` Roberto Sassu 2017-11-07 10:37 ` [PATCH v2 09/15] ima: introduce securityfs interfaces for digest lists Roberto Sassu 2017-11-07 10:37 ` Roberto Sassu 2017-11-07 10:37 ` [PATCH v2 10/15] ima: disable digest lookup if digest lists are not checked Roberto Sassu 2017-11-07 10:37 ` Roberto Sassu 2017-11-07 10:37 ` [PATCH v2 11/15] ima: add policy action digest_list Roberto Sassu 2017-11-07 10:37 ` Roberto Sassu 2017-11-07 10:37 ` [PATCH v2 12/15] ima: do not update security.ima if appraisal status is not INTEGRITY_PASS Roberto Sassu 2017-11-07 10:37 ` Roberto Sassu 2017-11-18 4:25 ` Serge E. Hallyn 2017-11-18 4:25 ` Serge E. Hallyn 2017-11-07 10:37 ` [PATCH v2 13/15] evm: add kernel command line option to select protected xattrs Roberto Sassu 2017-11-07 10:37 ` Roberto Sassu 2017-11-07 10:37 ` [PATCH v2 14/15] ima: add support for appraisal with digest lists Roberto Sassu 2017-11-07 10:37 ` Roberto Sassu 2017-11-07 10:37 ` [PATCH v2 15/15] ima: add Documentation/security/IMA-digest-lists.txt Roberto Sassu 2017-11-07 10:37 ` Roberto Sassu 2017-11-07 13:37 ` [PATCH v2 00/15] ima: digest list feature Mimi Zohar 2017-11-07 13:37 ` Mimi Zohar 2017-11-07 13:37 ` Mimi Zohar 2017-11-07 16:45 ` Roberto Sassu 2017-11-07 16:45 ` Roberto Sassu 2017-11-07 16:45 ` Roberto Sassu 2017-11-17 1:08 ` Kees Cook 2017-11-17 1:08 ` Kees Cook 2017-11-17 8:55 ` Roberto Sassu 2017-11-17 8:55 ` Roberto Sassu 2017-11-17 12:21 ` Mimi Zohar 2017-11-17 12:21 ` Mimi Zohar 2017-11-17 12:21 ` Mimi Zohar 2017-11-07 14:49 ` Matthew Garrett 2017-11-07 14:49 ` Matthew Garrett 2017-11-07 17:53 ` Roberto Sassu 2017-11-07 17:53 ` Roberto Sassu 2017-11-07 18:06 ` Matthew Garrett 2017-11-07 18:06 ` Matthew Garrett 2017-11-08 12:00 ` Roberto Sassu 2017-11-08 12:00 ` Roberto Sassu 2017-11-08 15:48 ` Matthew Garrett 2017-11-08 15:48 ` Matthew Garrett 2017-11-09 9:51 ` Roberto Sassu 2017-11-09 9:51 ` Roberto Sassu 2017-11-09 14:47 ` Matthew Garrett 2017-11-09 14:47 ` Matthew Garrett 2017-11-09 16:13 ` Roberto Sassu 2017-11-09 16:13 ` Roberto Sassu 2017-11-09 16:46 ` Matthew Garrett 2017-11-09 16:46 ` Matthew Garrett 2017-11-09 17:23 ` Roberto Sassu 2017-11-09 17:23 ` Roberto Sassu 2017-11-09 16:17 ` Mimi Zohar 2017-11-09 16:17 ` Mimi Zohar 2017-11-09 16:17 ` Mimi Zohar 2017-11-07 18:03 ` Safford, David (GE Global Research, US) 2017-11-07 18:03 ` Safford, David (GE Global Research, US) 2017-11-07 18:03 ` Safford, David (GE Global Research, US) 2017-11-08 10:16 ` Roberto Sassu 2017-11-08 10:16 ` Roberto Sassu 2017-11-08 10:16 ` Roberto Sassu 2017-12-05 22:03 ` Ken Goldman 2017-12-05 22:03 ` Ken Goldman 2017-12-06 9:13 ` Roberto Sassu 2017-12-06 9:13 ` Roberto Sassu 2017-12-08 21:59 ` Ken Goldman 2017-12-11 8:26 ` Roberto Sassu 2017-12-22 15:56 ` Ken Goldman
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=20171107103710.10883-3-roberto.sassu@huawei.com \ --to=roberto.sassu@huawei.com \ --cc=linux-doc@vger.kernel.org \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-integrity@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-security-module@vger.kernel.org \ --cc=silviu.vlasceanu@huawei.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.