Patch "ima: fix ima_show_template_data_ascii()" has been added to the 3.14-stable tree
Subsystems (4)
This is a note to let you know that I've just added the patch titled
ima: fix ima_show_template_data_ascii()
to the 3.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
ima-fix-ima_show_template_data_ascii.patch
and it can be found in the queue-3.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
45b26133b97871896b8c5241d59f4ff7839db7b2Mon Sep 17 00:00:00 2001
From: Mimi Zohar <[email protected]>
Date: Thu, 11 Jun 2015 11:54:42 -0400
Subject: ima: fix ima_show_template_data_ascii()
From: Mimi Zohar <[email protected]>
commit 45b26133b97871896b8c5241d59f4ff7839db7b2 upstream.
This patch fixes a bug introduced in "4d7aeee ima: define new template ima-ng and template fields d-ng and n-ng".
Changelog:
- change int to uint32 (Roberto Sassu's suggestion)
--- security/integrity/ima/ima.h | 2 +- security/integrity/ima/ima_fs.c | 4 ++-- security/integrity/ima/ima_template_lib.c | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-)
security/integrity/ima/ima.h +1 -1
@@ -106,7 +106,7 @@ void ima_add_violation(struct file *file 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
@@ -186,9 +186,9 @@ static const struct file_operations ima_ .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
@@ -79,7 +79,8 @@ static void ima_show_template_data_asciienum 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 :
Patches currently in stable-queue which might be from [email protected] are
queue-3.14/evm-labeling-pseudo-filesystems-exception.patch queue-3.14/ima-fix-ima_show_template_data_ascii.patch