Commit 1a35914f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'integrity-v6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity 

Pull integrity subsystem updates from Mimi Zohar:

 - With commit 099f26f2 ("integrity: machine keyring CA
   configuration") certificates may be loaded onto the IMA keyring,
   directly or indirectly signed by keys on either the "builtin" or the
   "machine" keyrings.

   With the ability for the system/machine owner to sign the IMA policy
   itself without needing to recompile the kernel, update the IMA
   architecture specific policy rules to require the IMA policy itself
   be signed.

   [ As commit 099f26f2 was upstreamed in linux-6.4, updating the
     IMA architecture specific policy now to require signed IMA policies
     may break userspace expectations. ]

 - IMA only checked the file data hash was not on the system blacklist
   keyring for files with an appended signature (e.g. kernel modules,
   Power kernel image).

   Check all file data hashes regardless of how it was signed

 - Code cleanup, and a kernel-doc update

* tag 'integrity-v6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity:
  kexec_lock: Replace kexec_mutex() by kexec_lock() in two comments
  ima: require signed IMA policy when UEFI secure boot is enabled
  integrity: Always reference the blacklist keyring with appraisal
  ima: Remove deprecated IMA_TRUSTED_KEYRING Kconfig
parents 1086eeac 55e2b696

Documentation/ABI/testing/ima_policy

+3 −3
Original line number Diff line number Diff line
@@ -57,9 +57,9 @@ Description: 
				stored in security.ima xattr. Requires

				specifying "digest_type=verity" first.)



			appraise_flag:= [check_blacklist]

			Currently, blacklist check is only for files signed with appended

			signature.

			appraise_flag:= [check_blacklist] (deprecated)

			Setting the check_blacklist flag is no longer necessary.

			All appraisal functions set it by default.

			digest_type:= verity

			    Require fs-verity's file digest instead of the

			    regular IMA file hash.

arch/powerpc/kernel/ima_arch.c

+4 −4
Original line number Diff line number Diff line
@@ -23,9 +23,9 @@ bool arch_ima_get_secureboot(void) 
 * is not enabled.

 */

static const char *const secure_rules[] = {

	"appraise func=KEXEC_KERNEL_CHECK appraise_flag=check_blacklist appraise_type=imasig|modsig",

	"appraise func=KEXEC_KERNEL_CHECK appraise_type=imasig|modsig",

#ifndef CONFIG_MODULE_SIG

	"appraise func=MODULE_CHECK appraise_flag=check_blacklist appraise_type=imasig|modsig",

	"appraise func=MODULE_CHECK appraise_type=imasig|modsig",

#endif

	NULL

};
@@ -49,9 +49,9 @@ static const char *const trusted_rules[] = { 
static const char *const secure_and_trusted_rules[] = {

	"measure func=KEXEC_KERNEL_CHECK template=ima-modsig",

	"measure func=MODULE_CHECK template=ima-modsig",

	"appraise func=KEXEC_KERNEL_CHECK appraise_flag=check_blacklist appraise_type=imasig|modsig",

	"appraise func=KEXEC_KERNEL_CHECK appraise_type=imasig|modsig",

#ifndef CONFIG_MODULE_SIG

	"appraise func=MODULE_CHECK appraise_flag=check_blacklist appraise_type=imasig|modsig",

	"appraise func=MODULE_CHECK appraise_type=imasig|modsig",

#endif

	NULL

};

kernel/kexec_file.c

+1 −1
Original line number Diff line number Diff line
@@ -624,7 +624,7 @@ int kexec_locate_mem_hole(struct kexec_buf *kbuf) 
 * kexec_add_buffer - place a buffer in a kexec segment

 * @kbuf:	Buffer contents and memory parameters.

 *

 * This function assumes that kexec_mutex is held.

 * This function assumes that kexec_lock is held.

 * On successful return, @kbuf->mem will have the physical address of

 * the buffer in memory.

 *

security/integrity/ima/Kconfig

+0 −12
Original line number Diff line number Diff line
@@ -248,18 +248,6 @@ config IMA_APPRAISE_MODSIG 
	   The modsig keyword can be used in the IMA policy to allow a hook

	   to accept such signatures.



config IMA_TRUSTED_KEYRING

	bool "Require all keys on the .ima keyring be signed (deprecated)"

	depends on IMA_APPRAISE && SYSTEM_TRUSTED_KEYRING

	depends on INTEGRITY_ASYMMETRIC_KEYS

	select INTEGRITY_TRUSTED_KEYRING

	default y

	help

	   This option requires that all keys added to the .ima

	   keyring be signed by a key on the system trusted keyring.



	   This option is deprecated in favor of INTEGRITY_TRUSTED_KEYRING



config IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY

	bool "Permit keys validly signed by a built-in or secondary CA cert (EXPERIMENTAL)"

	depends on SYSTEM_TRUSTED_KEYRING

security/integrity/ima/ima_appraise.c

+7 −5
Original line number Diff line number Diff line
@@ -458,11 +458,13 @@ int ima_check_blacklist(struct integrity_iint_cache *iint, 
		ima_get_modsig_digest(modsig, &hash_algo, &digest, &digestsize);



		rc = is_binary_blacklisted(digest, digestsize);

	} else if (iint->flags & IMA_DIGSIG_REQUIRED && iint->ima_hash)

		rc = is_binary_blacklisted(iint->ima_hash->digest, iint->ima_hash->length);



	if ((rc == -EPERM) && (iint->flags & IMA_MEASURE))

		process_buffer_measurement(&nop_mnt_idmap, NULL, digest, digestsize,

					   "blacklisted-hash", NONE,

					   pcr, NULL, false, NULL, 0);

	}



	return rc;

}