Commit e37be534 authored by Mimi Zohar's avatar Mimi Zohar
Browse files

Merge branch 'ima-buffer-measurement-changes-v4' into next-integrity 

Based on cover letter "ima: Provide more info about buffer measurement":

Providing more information about buffer measurements requires
modification of the existing functions ima_measure_critical_data()
and process_buffer_measurement().  Unlike for file measurements,
there is no integrity_iint_cache structure for storing and retrieving
buffer measurements.

With these changes, kernel subsystems relying on IMA to measure
critical data don't have to duplicate the function to calculate the
buffer digest but, instead, can get directly the one that IMA would
insert, depending on the policy, in the new measurement list entry.
parents a32ad904 ca3c9bdb

include/linux/ima.h

+17 −6
Original line number Diff line number Diff line
@@ -11,9 +11,11 @@ 
#include <linux/fs.h>

#include <linux/security.h>

#include <linux/kexec.h>

#include <crypto/hash_info.h>

struct linux_binprm;



#ifdef CONFIG_IMA

extern enum hash_algo ima_get_current_hash_algo(void);

extern int ima_bprm_check(struct linux_binprm *bprm);

extern int ima_file_check(struct file *file, int mask);

extern void ima_post_create_tmpfile(struct user_namespace *mnt_userns,
@@ -33,10 +35,10 @@ extern void ima_post_path_mknod(struct user_namespace *mnt_userns, 
extern int ima_file_hash(struct file *file, char *buf, size_t buf_size);

extern int ima_inode_hash(struct inode *inode, char *buf, size_t buf_size);

extern void ima_kexec_cmdline(int kernel_fd, const void *buf, int size);

extern void ima_measure_critical_data(const char *event_label,

extern int ima_measure_critical_data(const char *event_label,

				     const char *event_name,

				     const void *buf, size_t buf_len,

				      bool hash);

				     bool hash, u8 *digest, size_t digest_len);



#ifdef CONFIG_IMA_APPRAISE_BOOTPARAM

extern void ima_appraise_parse_cmdline(void);
@@ -64,6 +66,11 @@ static inline const char * const *arch_get_ima_policy(void) 
#endif



#else

static inline enum hash_algo ima_get_current_hash_algo(void)

{

	return HASH_ALGO__LAST;

}



static inline int ima_bprm_check(struct linux_binprm *bprm)

{

	return 0;
@@ -137,10 +144,14 @@ static inline int ima_inode_hash(struct inode *inode, char *buf, size_t buf_size 


static inline void ima_kexec_cmdline(int kernel_fd, const void *buf, int size) {}



static inline void ima_measure_critical_data(const char *event_label,

static inline int ima_measure_critical_data(const char *event_label,

					     const char *event_name,

					     const void *buf, size_t buf_len,

					     bool hash) {}

					     bool hash, u8 *digest,

					     size_t digest_len)

{

	return -ENOENT;

}



#endif /* CONFIG_IMA */

security/integrity/ima/ima.h

+5 −5
Original line number Diff line number Diff line
@@ -264,11 +264,11 @@ void ima_store_measurement(struct integrity_iint_cache *iint, struct file *file, 
			   struct evm_ima_xattr_data *xattr_value,

			   int xattr_len, const struct modsig *modsig, int pcr,

			   struct ima_template_desc *template_desc);

void process_buffer_measurement(struct user_namespace *mnt_userns,

int process_buffer_measurement(struct user_namespace *mnt_userns,

			       struct inode *inode, const void *buf, int size,

			       const char *eventname, enum ima_hooks func,

			       int pcr, const char *func_data,

				bool buf_hash);

			       bool buf_hash, u8 *digest, size_t digest_len);

void ima_audit_measurement(struct integrity_iint_cache *iint,

			   const unsigned char *filename);

int ima_alloc_init_template(struct ima_event_data *event_data,

security/integrity/ima/ima_appraise.c

+1 −1
Original line number Diff line number Diff line
@@ -357,7 +357,7 @@ int ima_check_blacklist(struct integrity_iint_cache *iint, 
		if ((rc == -EPERM) && (iint->flags & IMA_MEASURE))

			process_buffer_measurement(&init_user_ns, NULL, digest, digestsize,

						   "blacklisted-hash", NONE,

						   pcr, NULL, false);

						   pcr, NULL, false, NULL, 0);

	}



	return rc;

security/integrity/ima/ima_asymmetric_keys.c

+1 −1
Original line number Diff line number Diff line
@@ -62,5 +62,5 @@ void ima_post_key_create_or_update(struct key *keyring, struct key *key, 
	 */

	process_buffer_measurement(&init_user_ns, NULL, payload, payload_len,

				   keyring->description, KEY_CHECK, 0,

				   keyring->description, false);

				   keyring->description, false, NULL, 0);

}

security/integrity/ima/ima_init.c

+2 −1
Original line number Diff line number Diff line
@@ -154,7 +154,8 @@ int __init ima_init(void) 
	ima_init_key_queue();



	ima_measure_critical_data("kernel_info", "kernel_version",

				  UTS_RELEASE, strlen(UTS_RELEASE), false);

				  UTS_RELEASE, strlen(UTS_RELEASE), false,

				  NULL, 0);



	return rc;

}