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

!6197 tee: amdtee: fix use-after-free vulnerability in amdtee_close_session 

Merge Pull Request from: @ci-robot 
 
PR sync from: Guo Mengqi <guomengqi3@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/DQ7DFW47GUCO5GTJC3BTWRLJM3UNYME6/ 
 
https://gitee.com/openeuler/kernel/issues/I9AWJ5 
 
Link:https://gitee.com/openeuler/kernel/pulls/6197

 

Reviewed-by: default avatarWeilong Chen <chenweilong@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 582560b0 486dfde1

drivers/tee/amdtee/core.c

+6 −4
Original line number Diff line number Diff line
@@ -217,12 +217,12 @@ static int copy_ta_binary(struct tee_context *ctx, void *ptr, void **ta, 
	return rc;

}



/* mutex must be held by caller */

static void destroy_session(struct kref *ref)

{

	struct amdtee_session *sess = container_of(ref, struct amdtee_session,

						   refcount);



	mutex_lock(&session_list_mutex);

	list_del(&sess->list_node);

	mutex_unlock(&session_list_mutex);

	kfree(sess);
@@ -277,7 +277,8 @@ int amdtee_open_session(struct tee_context *ctx, 
	if (i >= TEE_NUM_SESSIONS) {

		pr_err("reached maximum session count %d\n", TEE_NUM_SESSIONS);

		handle_unload_ta(ta_handle);

		kref_put(&sess->refcount, destroy_session);

		kref_put_mutex(&sess->refcount, destroy_session,

				&session_list_mutex);

		rc = -ENOMEM;

		goto out;

	}
@@ -290,7 +291,8 @@ int amdtee_open_session(struct tee_context *ctx, 
		clear_bit(i, sess->sess_mask);

		spin_unlock(&sess->lock);

		handle_unload_ta(ta_handle);

		kref_put(&sess->refcount, destroy_session);

		kref_put_mutex(&sess->refcount, destroy_session,

				&session_list_mutex);

		goto out;

	}
@@ -332,7 +334,7 @@ int amdtee_close_session(struct tee_context *ctx, u32 session) 
	handle_close_session(ta_handle, session_info);

	handle_unload_ta(ta_handle);



	kref_put(&sess->refcount, destroy_session);

	kref_put_mutex(&sess->refcount, destroy_session, &session_list_mutex);



	return 0;

}