bug fixes for Linus
Subsystems (3)
v2 cover bug fixes for Linus
Both of these patches are bug fixes for patches, which were upstreamed in this open window. The first patch addresses a merge issue. The second patch addresses a CONFIG_BLOCK dependency.
thanks,
Mimi
Mimi Zohar (2):
ima: "remove enforce checking duplication" merge fix
block: fix part_pack_uuid() build error
include/linux/genhd.h | 10 ++++++++++ security/integrity/ima/ima_main.c | 3 ++- security/integrity/ima/ima_policy.c | 11 ++++++----- 3 files changed, 18 insertions(+), 6 deletions(-)
Signature · 1 line
1.8.1.rc3
PATCH v2 1/2 ima: "remove enforce checking duplication" merge fix
Commit "750943a ima: remove enforce checking duplication" combined the 'in IMA policy' and 'enforcing file integrity' checks. For the non-file, kernel module verification, a specific check for 'enforcing file integrity' was not added. This patch adds the check.
--- security/integrity/ima/ima_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
security/integrity/ima/ima_main.c +2 -1
@@ -284,7 +284,8 @@ int ima_module_check(struct file *file) {if (!file) {#ifndef CONFIG_MODULE_SIG_FORCE -if (ima_appraise &IMA_APPRAISE_MODULES ) +if ((ima_appraise &IMA_APPRAISE_MODULES ) && + (ima_appraise &IMA_APPRAISE_ENFORCE ))return -EACCES ;/* INTEGRITY_UNKNOWN */ #endif return 0 ;/* We rely on module signature checking */
Signature · 1 line
1.8.1.rc3
PATCH v2 2/2 block: fix part_pack_uuid() build error
In reply to Mimi ZoharCommit "85865c1 ima: add policy support for file system uuid" introduced a CONFIG_BLOCK dependency. This patch defines a wrapper called blk_part_pack_uuid(), which 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 v2:
- Reference commit number in patch description Changelog v1:
- rename ima_part_pack_uuid() to blk_part_pack_uuid()
- resolve scripts/checkpatch.pl warnings Changelog v0:
- fix UUID scripts/Lindent msgs
--- include/linux/genhd.h | 10 ++++++++++ security/integrity/ima/ima_policy.c | 11 ++++++----- 2 files changed, 16 insertions(+), 5 deletions(-)
include/linux/genhd.h +10 -0
@@ -231,6 +231,12 @@ static inline void part_pack_uuid(const u8 *uuid_str, u8 *to) } } +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(const char *name, int partno)return devt; } +static inline int blk_part_pack_uuid (const u8 *uuid_str,u8 *to) +{ +return -EINVAL ; +}#endif /* CONFIG_BLOCK */ #endif /* _LINUX_GENHD_H */
security/integrity/ima/ima_policy.c +6 -5
@@ -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 =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);
Signature · 1 line
1.8.1.rc3