lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

Browse Source 
Pull security subsystem fixes from James Morris:
 "From Mimi:

    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."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  block: fix part_pack_uuid() build error
  ima: "remove enforce checking duplication" merge fix
This commit is contained in:
Linus Torvalds
2013-02-25 15:45:29 -08:00
parent c69d0a15d2 446d64e3e1
commit f6d43b93bd
3 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/linux/genhd.h
View File

@@ -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) static inline int disk_max_parts(struct gendisk *disk)
{ {
if (disk->flags & GENHD_FL_EXT_DEVT) 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; return devt;
} }
static inline int blk_part_pack_uuid(const u8 *uuid_str, u8 *to)
{
return -EINVAL;
}
#endif /* CONFIG_BLOCK */ #endif /* CONFIG_BLOCK */
#endif /* _LINUX_GENHD_H */ #endif /* _LINUX_GENHD_H */

3
security/integrity/ima/ima_main.c
View File

@@ -284,7 +284,8 @@ int ima_module_check(struct file *file)
{ {
if (!file) { if (!file) {
#ifndef CONFIG_MODULE_SIG_FORCE #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 */ return -EACCES; /* INTEGRITY_UNKNOWN */
#endif #endif
return 0; /* We rely on module signature checking */ return 0; /* We rely on module signature checking */

5
security/integrity/ima/ima_policy.c
View File

@@ -535,9 +535,10 @@ static int ima_parse_rule(char *rule, struct ima_rule_entry *entry)
break; break;
} }
part_pack_uuid(args[0].from, entry->fsuuid); result = blk_part_pack_uuid(args[0].from,
entry->fsuuid);
if (!result)
entry->flags |= IMA_FSUUID; entry->flags |= IMA_FSUUID;
result = 0;
break; break;
case Opt_uid: case Opt_uid:
ima_log_string(ab, "uid", args[0].from); ima_log_string(ab, "uid", args[0].from);