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

Commit 45b26133 authored by Mimi Zohar's avatar Mimi Zohar
Browse files

ima: fix ima_show_template_data_ascii() 



This patch fixes a bug introduced in "4d7aeee7 ima: define new template
ima-ng and template fields d-ng and n-ng".

Changelog:
- change int to uint32 (Roberto Sassu's suggestion)

Signed-off-by: default avatarMimi Zohar <zohar@linux.vnet.ibm.com>
Signed-off-by: default avatarRoberto Sassu <rsassu@suse.de>
Cc: stable@vger.kernel.org # 3.13
parent d6f7aa27

security/integrity/ima/ima.h

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ void ima_add_violation(struct file *file, const unsigned char *filename, 
		       const char *op, const char *cause);

int ima_init_crypto(void);

void ima_putc(struct seq_file *m, void *data, int datalen);

void ima_print_digest(struct seq_file *m, u8 *digest, int size);

void ima_print_digest(struct seq_file *m, u8 *digest, u32 size);

struct ima_template_desc *ima_template_desc_current(void);

int ima_init_template(void);

security/integrity/ima/ima_fs.c

+2 −2
Original line number Diff line number Diff line
@@ -190,9 +190,9 @@ static const struct file_operations ima_measurements_ops = { 
	.release = seq_release,

};



void ima_print_digest(struct seq_file *m, u8 *digest, int size)

void ima_print_digest(struct seq_file *m, u8 *digest, u32 size)

{

	int i;

	u32 i;



	for (i = 0; i < size; i++)

		seq_printf(m, "%02x", *(digest + i));

security/integrity/ima/ima_template_lib.c

+2 −1
Original line number Diff line number Diff line
@@ -70,7 +70,8 @@ static void ima_show_template_data_ascii(struct seq_file *m, 
					 enum data_formats datafmt,

					 struct ima_field_data *field_data)

{

	u8 *buf_ptr = field_data->data, buflen = field_data->len;

	u8 *buf_ptr = field_data->data;

	u32 buflen = field_data->len;



	switch (datafmt) {

	case DATA_FMT_DIGEST_WITH_ALGO: