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

!13401 IMA: Fix hungtask issue of digestlist importing 

Merge Pull Request from: @xucee 
 
bugzilla: https://gitee.com/openeuler/kernel/issues/IB6364

In the function ima_check_measured_appraised, if the digest list is not
measured or appraised, the function returns without releasing the lock
iint->mutex.

Fixes: 7d79ba08 ("ima: dont disable digest_list if the file is not processed") 
 
Link:https://gitee.com/openeuler/kernel/pulls/13401

 

Reviewed-by: default avatarLi Nan <linan122@huawei.com>
Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarLi Nan <linan122@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 220bfa0e ae40df38

security/integrity/ima/ima_digest_list.c

+2 −0
Original line number Diff line number Diff line
@@ -262,6 +262,7 @@ bool ima_check_measured_appraised(struct file *file) 
	if ((ima_digest_list_actions & IMA_MEASURE) &&

	    !(iint->flags & IMA_MEASURED)) {

		pr_err("%s not measured\n", file_dentry(file)->d_name.name);

		mutex_unlock(&iint->mutex);

		return false;

	}
@@ -269,6 +270,7 @@ bool ima_check_measured_appraised(struct file *file) 
	    (!(iint->flags & IMA_APPRAISED) ||

	    !test_bit(IMA_DIGSIG, &iint->atomic_flags))) {

		pr_err("%s not appraised\n", file_dentry(file)->d_name.name);

		mutex_unlock(&iint->mutex);

		return false;

	}