Unverified Commit fa138ed5 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!339 ima: Fix a potential NULL pointer access in ima_restore_measurement_list 

Merge Pull Request from: @HuaxinLuGitee 
 
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. 
 
Link:https://gitee.com/openeuler/kernel/pulls/339

 
Reviewed-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents bbee829a f402238d

security/integrity/ima/ima_template.c

+4 −1
Original line number Diff line number Diff line
@@ -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);