Commit 2c0768b2 authored by Roberto Sassu's avatar Roberto Sassu Committed by Huaxin Lu
Browse files

ima: Add ima_show_template_uint() template library function 

stable inclusion
from stable-v6.9.3
commit cde1391a
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I9RJ09
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=cde1391a0b4014b0e8fc09cd316272f478b54c0f



--------------------------------

[ Upstream commit cde1391a ]

This patch introduces the new function ima_show_template_uint(). This can
be used for showing integers of different sizes in ASCII format. The
function ima_show_template_data_ascii() automatically determines how to
print a stored integer by checking the integer size.

If integers have been written in canonical format,
ima_show_template_data_ascii() calls the appropriate leXX_to_cpu() function
to correctly display the value.

Signed-off-by: default avatarRoberto Sassu <roberto.sassu@huawei.com>
Signed-off-by: default avatarMimi Zohar <zohar@linux.ibm.com>
Signed-off-by: default avatarHuaxin Lu <luhuaxin1@huawei.com>
parent 7fbca9a8

security/integrity/ima/ima_template_lib.c

+37 −1
Original line number Diff line number Diff line
@@ -26,7 +26,8 @@ enum data_formats { 
	DATA_FMT_DIGEST = 0,

	DATA_FMT_DIGEST_WITH_ALGO,

	DATA_FMT_STRING,

	DATA_FMT_HEX

	DATA_FMT_HEX,

	DATA_FMT_UINT

};



static int ima_write_template_field_data(const void *data, const u32 datalen,
@@ -90,6 +91,35 @@ static void ima_show_template_data_ascii(struct seq_file *m, 
	case DATA_FMT_STRING:

		seq_printf(m, "%s", buf_ptr);

		break;

	case DATA_FMT_UINT:

		switch (field_data->len) {

		case sizeof(u8):

			seq_printf(m, "%u", *(u8 *)buf_ptr);

			break;

		case sizeof(u16):

			if (ima_canonical_fmt)

				seq_printf(m, "%u",

					   le16_to_cpu(*(u16 *)buf_ptr));

			else

				seq_printf(m, "%u", *(u16 *)buf_ptr);

			break;

		case sizeof(u32):

			if (ima_canonical_fmt)

				seq_printf(m, "%u",

					   le32_to_cpu(*(u32 *)buf_ptr));

			else

				seq_printf(m, "%u", *(u32 *)buf_ptr);

			break;

		case sizeof(u64):

			if (ima_canonical_fmt)

				seq_printf(m, "%llu",

					   le64_to_cpu(*(u64 *)buf_ptr));

			else

				seq_printf(m, "%llu", *(u64 *)buf_ptr);

			break;

		default:

			break;

		}

	default:

		break;

	}
@@ -165,6 +195,12 @@ void ima_show_template_buf(struct seq_file *m, enum ima_show_type show, 
	ima_show_template_field_data(m, show, DATA_FMT_HEX, field_data);

}



void ima_show_template_uint(struct seq_file *m, enum ima_show_type show,

			    struct ima_field_data *field_data)

{

	ima_show_template_field_data(m, show, DATA_FMT_UINT, field_data);

}



/**

 * ima_parse_buf() - Parses lengths and data from an input buffer

 * @bufstartp:       Buffer start address.

security/integrity/ima/ima_template_lib.h

+2 −0
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ void ima_show_template_sig(struct seq_file *m, enum ima_show_type show, 
			   struct ima_field_data *field_data);

void ima_show_template_buf(struct seq_file *m, enum ima_show_type show,

			   struct ima_field_data *field_data);

void ima_show_template_uint(struct seq_file *m, enum ima_show_type show,

			    struct ima_field_data *field_data);

int ima_parse_buf(void *bufstartp, void *bufendp, void **bufcurp,

		  int maxfields, struct ima_field_data *fields, int *curfields,

		  unsigned long *len_mask, int enforce_mask, char *bufname);