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

Merge tag 'integrity-v5.12-fix' of... 

Merge tag 'integrity-v5.12-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity

Pull integrity fix from Mimi Zohar:
 "Just one patch to address a NULL ptr dereferencing when there is a
  mismatch between the user enabled LSMs and IMA/EVM"

* tag 'integrity-v5.12-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity:
  integrity: double check iint_cache was initialized
parents 701c09c9 92063f3c

security/integrity/iint.c

+8 −0
Original line number Diff line number Diff line
@@ -98,6 +98,14 @@ struct integrity_iint_cache *integrity_inode_get(struct inode *inode) 
	struct rb_node *node, *parent = NULL;

	struct integrity_iint_cache *iint, *test_iint;



	/*

	 * The integrity's "iint_cache" is initialized at security_init(),

	 * unless it is not included in the ordered list of LSMs enabled

	 * on the boot command line.

	 */

	if (!iint_cache)

		panic("%s: lsm=integrity required.\n", __func__);



	iint = integrity_iint_find(inode);

	if (iint)

		return iint;