Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f6d43b93 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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
parents c69d0a15 446d64e3

include/linux/genhd.h

+10 −0
Original line number Diff line number Diff line
@@ -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_main.c

+2 −1
Original line number Diff line number Diff line
@@ -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 */

security/integrity/ima/ima_policy.c

+6 −5
Original line number Diff line number Diff line
@@ -535,9 +535,10 @@ static int ima_parse_rule(char *rule, struct ima_rule_entry *entry) 
				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;

			result = 0;

			break;

		case Opt_uid:

			ima_log_string(ab, "uid", args[0].from);