Messages in this thread | | | Subject | Re: [PATCH] ima: store address of template_fmt_copy in a pointer before calling strsep | From | Mimi Zohar <> | Date | Wed, 27 Nov 2013 09:55:19 -0500 |
| |
On Wed, 2013-11-27 at 14:40 +0100, Roberto Sassu wrote: > 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: Roberto Sassu <roberto.sassu@polito.it> Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
> --- > security/integrity/ima/ima_template.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/security/integrity/ima/ima_template.c b/security/integrity/ima/ima_template.c > index 913e192..635695f 100644 > --- a/security/integrity/ima/ima_template.c > +++ b/security/integrity/ima/ima_template.c > @@ -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); >
| |