lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Sun, 28 May 2017 13:20:00 +0300 From: Christoph Hellwig <hch@....de> To: Andy Shevchenko <andriy.shevchenko@...ux.intel.com>, Amir Goldstein <amir73il@...il.com>, linux-fsdevel@...r.kernel.org Cc: Shaohua Li <shli@...nel.org>, Dan Williams <dan.j.williams@...el.com>, David Howells <dhowells@...hat.com>, Steven Whitehouse <swhiteho@...hat.com>, Mimi Zohar <zohar@...ux.vnet.ibm.com>, linux-xfs@...r.kernel.org, linux-raid@...r.kernel.org, linux-nvdimm@...ts.01.org, linux-kernel@...r.kernel.org, linux-block@...r.kernel.org Subject: [PATCH 14/22] ima/policy: switch to use uuid_t Signed-off-by: Christoph Hellwig <hch@....de> Reviewed-by: Amir Goldstein <amir73il@...il.com> Acked-by: Mimi Zohar <zohar@...ux.vnet.ibm.com> Reviewed-by: Andy Shevchenko <andriy.shevchenko@...ux.intel.com> --- security/integrity/ima/ima_policy.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c index 49fbc3e8f012..da3e7d50e0d7 100644 --- a/security/integrity/ima/ima_policy.c +++ b/security/integrity/ima/ima_policy.c @@ -61,7 +61,7 @@ struct ima_rule_entry { enum ima_hooks func; int mask; unsigned long fsmagic; - u8 fsuuid[16]; + uuid_t fsuuid; kuid_t uid; kuid_t fowner; bool (*uid_op)(kuid_t, kuid_t); /* Handlers for operators */ @@ -244,7 +244,7 @@ static bool ima_match_rules(struct ima_rule_entry *rule, struct inode *inode, && rule->fsmagic != inode->i_sb->s_magic) return false; if ((rule->flags & IMA_FSUUID) && - memcmp(rule->fsuuid, inode->i_sb->s_uuid, sizeof(rule->fsuuid))) + memcmp(&rule->fsuuid, inode->i_sb->s_uuid, sizeof(rule->fsuuid))) return false; if ((rule->flags & IMA_UID) && !rule->uid_op(cred->uid, rule->uid)) return false; @@ -711,13 +711,12 @@ static int ima_parse_rule(char *rule, struct ima_rule_entry *entry) case Opt_fsuuid: ima_log_string(ab, "fsuuid", args[0].from); - if (memchr_inv(entry->fsuuid, 0x00, - sizeof(entry->fsuuid))) { + if (uuid_is_null(&entry->fsuuid)) { result = -EINVAL; break; } - result = uuid_to_bin(args[0].from, (uuid_t *)&entry->fsuuid); + result = uuid_to_bin(args[0].from, &entry->fsuuid); if (!result) entry->flags |= IMA_FSUUID; break; @@ -1086,7 +1085,7 @@ int ima_policy_show(struct seq_file *m, void *v) } if (entry->flags & IMA_FSUUID) { - seq_printf(m, "fsuuid=%pU", entry->fsuuid); + seq_printf(m, "fsuuid=%pU", &entry->fsuuid); seq_puts(m, " "); } -- 2.11.0
Powered by blists - more mailing lists