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

Commit 1bd7face authored by Roberto Sassu's avatar Roberto Sassu Committed by Mimi Zohar
Browse files

ima: allocate field pointers array on demand in template_desc_init_fields() 



The allocation of a field pointers array is moved at the end of
template_desc_init_fields() and done only if the value of the 'fields'
and 'num_fields' parameters is not NULL. For just validating a template
format string, retrieved template field pointers are placed in a temporary
array.

Changelog:
 - v3:
   - do not check in this patch if 'fields' and 'num_fields' are NULL
     (suggested by Mimi Zohar)

Signed-off-by: default avatarRoberto Sassu <roberto.sassu@polito.it>
Signed-off-by: default avatarMimi Zohar <zohar@linux.vnet.ibm.com>
parent 9f3166b8

security/integrity/ima/ima_template.c

+13 −21
Original line number Original line Diff line number Diff line
@@ -117,8 +117,9 @@ static int template_desc_init_fields(const char *template_fmt, 
				     int *num_fields)

				     int *num_fields)

{

{

	const char *template_fmt_ptr;

	const char *template_fmt_ptr;

	struct ima_template_field *found_fields[IMA_TEMPLATE_NUM_FIELDS_MAX];

	int template_num_fields = template_fmt_size(template_fmt);

	int template_num_fields = template_fmt_size(template_fmt);

	int i, len, result = 0;

	int i, len;





	if (template_num_fields > IMA_TEMPLATE_NUM_FIELDS_MAX) {

	if (template_num_fields > IMA_TEMPLATE_NUM_FIELDS_MAX) {

		pr_err("format string '%s' contains too many fields\n",

		pr_err("format string '%s' contains too many fields\n",
@@ -126,41 +127,32 @@ static int template_desc_init_fields(const char *template_fmt, 
		return -EINVAL;

		return -EINVAL;

	}

	}





	*fields = kzalloc(template_num_fields * sizeof(*fields), GFP_KERNEL);

	if (*fields == NULL) {

		result = -ENOMEM;

		goto out;

	}



	for (i = 0, template_fmt_ptr = template_fmt; i < template_num_fields;

	for (i = 0, template_fmt_ptr = template_fmt; i < template_num_fields;

	     i++, template_fmt_ptr += len + 1) {

	     i++, template_fmt_ptr += len + 1) {

		char tmp_field_id[IMA_TEMPLATE_FIELD_ID_MAX_LEN + 1];

		char tmp_field_id[IMA_TEMPLATE_FIELD_ID_MAX_LEN + 1];

		struct ima_template_field *f;





		len = strchrnul(template_fmt_ptr, '|') - template_fmt_ptr;

		len = strchrnul(template_fmt_ptr, '|') - template_fmt_ptr;

		if (len == 0 || len > IMA_TEMPLATE_FIELD_ID_MAX_LEN) {

		if (len == 0 || len > IMA_TEMPLATE_FIELD_ID_MAX_LEN) {

			pr_err("Invalid field with length %d\n", len);

			pr_err("Invalid field with length %d\n", len);

			result = -EINVAL;

			return -EINVAL;

			goto out;

		}

		}





		memcpy(tmp_field_id, template_fmt_ptr, len);

		memcpy(tmp_field_id, template_fmt_ptr, len);

		tmp_field_id[len] = '\0';

		tmp_field_id[len] = '\0';

		f = lookup_template_field(tmp_field_id);

		found_fields[i] = lookup_template_field(tmp_field_id);

		if (!f) {

		if (!found_fields[i]) {

			pr_err("field '%s' not found\n", tmp_field_id);

			pr_err("field '%s' not found\n", tmp_field_id);

			result = -ENOENT;

			return -ENOENT;

			goto out;

		}

		}

		(*fields)[i] = f;

	}

	}



	*fields = kmalloc_array(i, sizeof(*fields), GFP_KERNEL);

	if (*fields == NULL)

		return -ENOMEM;



	memcpy(*fields, found_fields, i * sizeof(*fields));

	*num_fields = i;

	*num_fields = i;

out:

	return 0;

	if (result < 0) {

		kfree(*fields);

		*fields = NULL;

	}

	return result;

}

}





struct ima_template_desc *ima_template_desc_current(void)

struct ima_template_desc *ima_template_desc_current(void)