Skip to content

Commit

Permalink
ima: Fix a potential NULL pointer access in ima_restore_measurement_list
Browse files Browse the repository at this point in the history
commit 11220db upstream.

In restore_template_fmt, when kstrdup fails, a non-NULL value will still be
returned, which causes a NULL pointer access in template_desc_init_fields.

Fixes: c7d0936 ("ima: support restoring multiple template formats")
Cc: stable@kernel.org
Co-developed-by: Jiaming Li <lijiaming30@huawei.com>
Signed-off-by: Jiaming Li <lijiaming30@huawei.com>
Signed-off-by: Huaxin Lu <luhuaxin1@huawei.com>
Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>
Signed-off-by: Mimi Zohar <zohar@linux.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Huaxin Lu authored and gregkh committed Jan 12, 2023
1 parent a843699 commit 3b49840
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion security/integrity/ima/ima_template.c
Expand Up @@ -336,8 +336,11 @@ static struct ima_template_desc *restore_template_fmt(char *template_name)

template_desc->name = "";
template_desc->fmt = kstrdup(template_name, GFP_KERNEL);
if (!template_desc->fmt)
if (!template_desc->fmt) {
kfree(template_desc);
template_desc = NULL;
goto out;
}

spin_lock(&template_list);
list_add_tail_rcu(&template_desc->list, &defined_templates);
Expand Down

0 comments on commit 3b49840

Please sign in to comment.