Skip to contentSkip to conversation

ima: fix part_pack_uuid() build error

PATCH In review Mimi Zohar 3 participants 4 messages Feb 22, 2013 – Feb 24, 2013

Subsystems (4)
lore
Share & tools
lore

Mimi Zohar

author
#0 lore raw

PATCH 1/1 ima: fix part_pack_uuid() build error

Fix a build error when CONFIG_BLOCK is not enabled by defining a wrapper called ima_part_pack_uuid(). The wrapper returns -EINVAL, when CONFIG_BLOCK is not defined.

security/integrity/ima/ima_policy.c:538:4: error: implicit declaration of function 'part_pack_uuid' [-Werror=implicit-function-declaration]

Changelog v0:
- fix UUID scripts/Lindent msgs

---
 security/integrity/ima/ima.h        | 13 +++++++++++++
 security/integrity/ima/ima_policy.c | 11 ++++++-----
 2 files changed, 19 insertions(+), 5 deletions(-)
security/integrity/ima/ima.h +13 -0
index a41c9c1..902c356 100644
@@ -21,6 +21,7 @@
 #include <linux/crypto.h>
 #include <linux/security.h>
 #include <linux/hash.h>
+#include <linux/genhd.h>
 #include <linux/tpm.h>
 #include <linux/audit.h>
 
@@ -199,4 +200,16 @@ static inline int security_filter_rule_match(u32 secid, u32 field, u32 op,
 	return -EINVAL;
 }
 #endif /* CONFIG_IMA_LSM_RULES */
+
+/* UUID policy option requires CONFIG_BLOCK */
+#ifdef CONFIG_BLOCK
+static inline int ima_part_pack_uuid(const u8 *uuid_str, u8 *to) {
+	part_pack_uuid(uuid_str, to);
+	return 0;
+}
+#else
+static inline int ima_part_pack_uuid(const u8 *uuid_str, u8 *to) {
+	return -EINVAL;
+}
+#endif
 #endif
security/integrity/ima/ima_policy.c +6 -5
index b27535a..41b7f48 100644
@@ -176,7 +176,7 @@ static bool ima_match_rules(struct ima_rule_entry *rule,
 	    && 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) && !uid_eq(rule->uid, cred->uid))
 		return false;
@@ -530,14 +530,15 @@ static int ima_parse_rule(char *rule, struct ima_rule_entry *entry)
 			ima_log_string(ab, "fsuuid", args[0].from);
 
 			if (memchr_inv(entry->fsuuid, 0x00,
-			    sizeof(entry->fsuuid))) {
+				       sizeof(entry->fsuuid))) {
 				result = -EINVAL;
 				break;
 			}
 
-			part_pack_uuid(args[0].from, entry->fsuuid);
-			entry->flags |= IMA_FSUUID;
-			result = 0;
+			result = ima_part_pack_uuid(args[0].from,
+						    entry->fsuuid);
+			if (!result)
+				entry->flags |= IMA_FSUUID;
 			break;
 		case Opt_uid:
 			ima_log_string(ab, "uid", args[0].from);
Signature · 1 line
1.8.1.rc3
#1 lore raw
Quoted 7 lines · Mimi Zohar

Fix a build error when CONFIG_BLOCK is not enabled by defining a wrapper called ima_part_pack_uuid(). The wrapper returns -EINVAL, when CONFIG_BLOCK is not defined.

security/integrity/ima/ima_policy.c:538:4: error: implicit declaration of function 'part_pack_uuid' [-Werror=implicit-function-declaration]

Quoted 6 lines

Changelog v0:
- fix UUID scripts/Lindent msgs

Except for the scripts/checkpatch.pl warnings for this patch, it looks better and fixes the build error. The build breakage has now made it to Linus' tree, so this will hopefully be pushed to him before rc1.

#2 lore raw
In reply to Mimi Zohar
Quoted 3 lines · Mimi Zohar

Fix a build error when CONFIG_BLOCK is not enabled by defining a wrapper called ima_part_pack_uuid(). The wrapper returns -EINVAL, when CONFIG_BLOCK is not defined.

Some function wrapper for the case of BLOCK not enabled should be handled where the function is defined, not where it is called.
That's how it is usually done in Linux.

Quoted 77 lines

security/integrity/ima/ima_policy.c:538:4: error: implicit declaration of function 'part_pack_uuid' [-Werror=implicit-function-declaration]

Changelog v0:
- fix UUID scripts/Lindent msgs

---
 security/integrity/ima/ima.h        | 13 +++++++++++++
 security/integrity/ima/ima_policy.c | 11 ++++++-----
 2 files changed, 19 insertions(+), 5 deletions(-)
security/integrity/ima/ima.h +13 -0
index a41c9c1..902c356 100644
@@ -21,6 +21,7 @@
 #include <linux/crypto.h>
 #include <linux/security.h>
 #include <linux/hash.h>
+#include <linux/genhd.h>
 #include <linux/tpm.h>
 #include <linux/audit.h>
 
@@ -199,4 +200,16 @@ static inline int security_filter_rule_match(u32 secid, u32 field, u32 op,
 	return -EINVAL;
 }
 #endif /* CONFIG_IMA_LSM_RULES */
+
+/* UUID policy option requires CONFIG_BLOCK */
+#ifdef CONFIG_BLOCK
+static inline int ima_part_pack_uuid(const u8 *uuid_str, u8 *to) {
+	part_pack_uuid(uuid_str, to);
+	return 0;
+}
+#else
+static inline int ima_part_pack_uuid(const u8 *uuid_str, u8 *to) {
+	return -EINVAL;
+}
+#endif
 #endif
security/integrity/ima/ima_policy.c +6 -5
index b27535a..41b7f48 100644
@@ -176,7 +176,7 @@ static bool ima_match_rules(struct ima_rule_entry *rule,
 	    && 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) && !uid_eq(rule->uid, cred->uid))
 		return false;
@@ -530,14 +530,15 @@ static int ima_parse_rule(char *rule, struct ima_rule_entry *entry)
 			ima_log_string(ab, "fsuuid", args[0].from);
 
 			if (memchr_inv(entry->fsuuid, 0x00,
-			    sizeof(entry->fsuuid))) {
+				       sizeof(entry->fsuuid))) {
 				result = -EINVAL;
 				break;
 			}
 
-			part_pack_uuid(args[0].from, entry->fsuuid);
-			entry->flags |= IMA_FSUUID;
-			result = 0;
+			result = ima_part_pack_uuid(args[0].from,
+						    entry->fsuuid);
+			if (!result)
+				entry->flags |= IMA_FSUUID;
 			break;
 		case Opt_uid:
 			ima_log_string(ab, "uid", args[0].from);
Signature · 1 line
~Randy
author
#3 lore raw
Quoted 8 lines · Randy Dunlap
Quoted 3 lines · Mimi Zohar

Fix a build error when CONFIG_BLOCK is not enabled by defining a wrapper called ima_part_pack_uuid(). The wrapper returns -EINVAL, when CONFIG_BLOCK is not defined.

Some function wrapper for the case of BLOCK not enabled should be handled where the function is defined, not where it is called.
That's how it is usually done in Linux.

Ok, I've renamed the wrapper from ima_part_pack_uuid() to blk_part_pack_uuid() and moved it to linux/genhd.h

thanks,

Mimi