The patch titled Subject: block: fix part_pack_uuid() build error has been added to the -mm tree. Its filename is block-fix-part_pack_uuid-build-error.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Mimi Zohar <zohar@xxxxxxxxxxxxxxxxxx> Subject: block: fix part_pack_uuid() build error Fix a build error when CONFIG_BLOCK is not enabled, by defining a wrapper called blk_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] Signed-off-by: Mimi Zohar <zohar@xxxxxxxxxxxxxxxxxx> Reported-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx> Reported-by: David Rientjes <rientjes@xxxxxxxxxx> Acked-by: David Rientjes <rientjes@xxxxxxxxxx> Acked-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx> Cc: James Morris <jmorris@xxxxxxxxx> Cc: Jens Axboe <axboe@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/genhd.h | 10 ++++++++++ security/integrity/ima/ima_policy.c | 11 ++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) diff -puN include/linux/genhd.h~block-fix-part_pack_uuid-build-error include/linux/genhd.h --- a/include/linux/genhd.h~block-fix-part_pack_uuid-build-error +++ a/include/linux/genhd.h @@ -231,6 +231,12 @@ static inline void part_pack_uuid(const } } +static inline int blk_part_pack_uuid(const u8 *uuid_str, u8 *to) +{ + part_pack_uuid(uuid_str, to); + return 0; +} + static inline int disk_max_parts(struct gendisk *disk) { if (disk->flags & GENHD_FL_EXT_DEVT) @@ -718,6 +724,10 @@ static inline dev_t blk_lookup_devt(cons return devt; } +static inline int blk_part_pack_uuid(const u8 *uuid_str, u8 *to) +{ + return -EINVAL; +} #endif /* CONFIG_BLOCK */ #endif /* _LINUX_GENHD_H */ diff -puN security/integrity/ima/ima_policy.c~block-fix-part_pack_uuid-build-error security/integrity/ima/ima_policy.c --- a/security/integrity/ima/ima_policy.c~block-fix-part_pack_uuid-build-error +++ a/security/integrity/ima/ima_policy.c @@ -176,7 +176,7 @@ static bool ima_match_rules(struct ima_r && 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, st 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 = blk_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); _ Patches currently in -mm which might be from zohar@xxxxxxxxxxxxxxxxxx are origin.patch block-fix-part_pack_uuid-build-error.patch ocfs2-fix-ocfs2_init_security_and_acl-to-initialize-acl-correctly.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html