[PATCH 07/12] ima: Fail rule parsing when the KEY_CHECK hook is combined with an invalid cond

[Tyler Hicks]

The KEY_CHECK function only supports the uid, pcr, and keyrings
conditionals. Make this clear at policy load so that IMA policy authors
don't assume that other conditionals are supported.

Fixes: 5808611cccb2 ("IMA: Add KEY_CHECK func to measure keys")
Signed-off-by: Tyler Hicks <tyhi...@linux.microsoft.com>
---
 security/integrity/ima/ima_policy.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/security/integrity/ima/ima_policy.c 
b/security/integrity/ima/ima_policy.c
index 83975ad22907..e33347148aa9 100644
--- a/security/integrity/ima/ima_policy.c
+++ b/security/integrity/ima/ima_policy.c
@@ -1024,6 +1024,13 @@ static bool ima_validate_rule(struct ima_rule_entry 
*entry)
                        if (entry->action & ~(MEASURE | DONT_MEASURE))
                                return false;
 
+                       if (entry->flags & ~(IMA_FUNC | IMA_UID | IMA_PCR |
+                                            IMA_KEYRINGS))
+                               return false;
+
+                       if (ima_rule_contains_lsm_cond(entry))
+                               return false;
+
                        break;
                default:
                        return false;
-- 
2.25.1