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

Commit af91706d authored by Roberto Sassu's avatar Roberto Sassu Committed by James Morris
Browse files

ima: store address of template_fmt_copy in a pointer before calling strsep 



This patch stores the address of the 'template_fmt_copy' variable in a new
variable, called 'template_fmt_ptr', so that the latter is passed as an
argument of strsep() instead of the former. This modification is needed
in order to correctly free the memory area referenced by
'template_fmt_copy' (strsep() modifies the pointer of the passed string).

Signed-off-by: default avatarRoberto Sassu <roberto.sassu@polito.it>
Reported-by: default avatarSebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: default avatarMimi Zohar <zohar@us.ibm.com>
Signed-off-by: default avatarJames Morris <james.l.morris@oracle.com>
parent dc1ccc48

security/integrity/ima/ima_template.c

+4 −2
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ static int template_desc_init_fields(const char *template_fmt, 
				     struct ima_template_field ***fields,

				     int *num_fields)

{

	char *c, *template_fmt_copy;

	char *c, *template_fmt_copy, *template_fmt_ptr;

	int template_num_fields = template_fmt_size(template_fmt);

	int i, result = 0;
@@ -127,7 +127,9 @@ static int template_desc_init_fields(const char *template_fmt, 
		result = -ENOMEM;

		goto out;

	}

	for (i = 0; (c = strsep(&template_fmt_copy, "|")) != NULL &&



	template_fmt_ptr = template_fmt_copy;

	for (i = 0; (c = strsep(&template_fmt_ptr, "|")) != NULL &&

	     i < template_num_fields; i++) {

		struct ima_template_field *f = lookup_template_field(c);