summaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorMike Rapoport <rppt@linux.vnet.ibm.com>2018-01-17 20:27:11 +0200
committerMimi Zohar <zohar@linux.vnet.ibm.com>2018-01-18 16:52:49 -0500
commit36447456e1cca853188505f2a964dbbeacfc7a7a (patch)
tree8adc810107a7f9b6943aff2d693fd15e54ddc96f /security
parenta2a2c3c8580a9158bca61221648fd6d5c98c443a (diff)
downloadlinux-36447456e1cca853188505f2a964dbbeacfc7a7a.tar.gz
linux-36447456e1cca853188505f2a964dbbeacfc7a7a.tar.bz2
linux-36447456e1cca853188505f2a964dbbeacfc7a7a.zip
ima/policy: fix parsing of fsuuid
The switch to uuid_t invereted the logic of verfication that &entry->fsuuid is zero during parsing of "fsuuid=" rule. Instead of making sure the &entry->fsuuid field is not attempted to be overwritten, we bail out for perfectly correct rule. Fixes: 787d8c530af7 ("ima/policy: switch to use uuid_t") Signed-off-by: Mike Rapoport <rppt@linux.vnet.ibm.com> Cc: stable@vger.kernel.org Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
Diffstat (limited to 'security')
-rw-r--r--security/integrity/ima/ima_policy.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c
index 93dcf1bf92a8..915f5572c6ff 100644
--- a/security/integrity/ima/ima_policy.c
+++ b/security/integrity/ima/ima_policy.c
@@ -765,7 +765,7 @@ static int ima_parse_rule(char *rule, struct ima_rule_entry *entry)
case Opt_fsuuid:
ima_log_string(ab, "fsuuid", args[0].from);
- if (uuid_is_null(&entry->fsuuid)) {
+ if (!uuid_is_null(&entry->fsuuid)) {
result = -EINVAL;
break;
}