Commit 93db202c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull integrity fixes from Mimi Zohar:
 "One bug fix, one performance improvement, and the use of
  static_assert:

   - The bug fix addresses "only a cosmetic change" commit, which didn't
     take into account the original 'ima' template definition.

  - The performance improvement limits the atomic_read()"

* tag 'integrity-v6.12' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity:
  integrity: Use static_assert() to check struct sizes
  evm: stop avoidably reading i_writecount in evm_file_release
  ima: fix buffer overrun in ima_eventdigest_init_common
parents 92dda329 08ae3e5f

security/integrity/evm/evm_main.c

+2 −1
Original line number Diff line number Diff line
@@ -1084,7 +1084,8 @@ static void evm_file_release(struct file *file) 
	if (!S_ISREG(inode->i_mode) || !(mode & FMODE_WRITE))

		return;



	if (iint && atomic_read(&inode->i_writecount) == 1)

	if (iint && iint->flags & EVM_NEW_FILE &&

	    atomic_read(&inode->i_writecount) == 1)

		iint->flags &= ~EVM_NEW_FILE;

}

security/integrity/ima/ima_template_lib.c

+10 −4
Original line number Diff line number Diff line
@@ -318,15 +318,21 @@ static int ima_eventdigest_init_common(const u8 *digest, u32 digestsize, 
				      hash_algo_name[hash_algo]);

	}



	if (digest)

	if (digest) {

		memcpy(buffer + offset, digest, digestsize);

	else

	} else {

		/*

		 * If digest is NULL, the event being recorded is a violation.

		 * Make room for the digest by increasing the offset by the

		 * hash algorithm digest size.

		 * hash algorithm digest size. If the hash algorithm is not

		 * specified increase the offset by IMA_DIGEST_SIZE which

		 * fits SHA1 or MD5

		 */

		if (hash_algo < HASH_ALGO__LAST)

			offset += hash_digest_size[hash_algo];

		else

			offset += IMA_DIGEST_SIZE;

	}



	return ima_write_template_field_data(buffer, offset + digestsize,

					     fmt, field_data);

security/integrity/integrity.h

+4 −0
Original line number Diff line number Diff line
@@ -37,6 +37,8 @@ struct evm_ima_xattr_data { 
	);

	u8 data[];

} __packed;

static_assert(offsetof(struct evm_ima_xattr_data, data) == sizeof(struct evm_ima_xattr_data_hdr),

	      "struct member likely outside of __struct_group()");



/* Only used in the EVM HMAC code. */

struct evm_xattr {
@@ -65,6 +67,8 @@ struct ima_digest_data { 
	);

	u8 digest[];

} __packed;

static_assert(offsetof(struct ima_digest_data, digest) == sizeof(struct ima_digest_data_hdr),

	      "struct member likely outside of __struct_group()");



/*

 * Instead of wrapping the ima_digest_data struct inside a local structure