mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 10:41:38 -04:00
ima: Fix a potential NULL pointer access in ima_restore_measurement_list
commit 11220db412edae8dba58853238f53258268bdb88 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: c7d0936770 ("ima: support restoring multiple template formats")
Cc: [email protected]
Co-developed-by: Jiaming Li <[email protected]>
Signed-off-by: Jiaming Li <[email protected]>
Signed-off-by: Huaxin Lu <[email protected]>
Reviewed-by: Stefan Berger <[email protected]>
Signed-off-by: Mimi Zohar <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
This commit is contained in:
parent
b163363535
commit
cf19abbe4b
1 changed files with 4 additions and 1 deletions
|
|
@ -292,8 +292,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);
|
||||
|
|
|
|||
Loading…
Reference in a new issue