Skip to content

Commit f4384b3

Browse files
Rijo Thomasjenswi-linaro
authored andcommitted
tee: amdtee: fix use-after-free vulnerability in amdtee_close_session
There is a potential race condition in amdtee_close_session that may cause use-after-free in amdtee_open_session. For instance, if a session has refcount == 1, and one thread tries to free this session via: kref_put(&sess->refcount, destroy_session); the reference count will get decremented, and the next step would be to call destroy_session(). However, if in another thread, amdtee_open_session() is called before destroy_session() has completed execution, alloc_session() may return 'sess' that will be freed up later in destroy_session() leading to use-after-free in amdtee_open_session. To fix this issue, treat decrement of sess->refcount and removal of 'sess' from session list in destroy_session() as a critical section, so that it is executed atomically. Fixes: 757cc3e ("tee: add AMD-TEE driver") Cc: stable@vger.kernel.org Signed-off-by: Rijo Thomas <Rijo-john.Thomas@amd.com> Reviewed-by: Sumit Garg <sumit.garg@linaro.org> Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
1 parent 2dde18c commit f4384b3

1 file changed

Lines changed: 6 additions & 4 deletions

File tree

drivers/tee/amdtee/core.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -217,12 +217,12 @@ static int copy_ta_binary(struct tee_context *ctx, void *ptr, void **ta,
217217
return rc;
218218
}
219219

220+
/* mutex must be held by caller */
220221
static void destroy_session(struct kref *ref)
221222
{
222223
struct amdtee_session *sess = container_of(ref, struct amdtee_session,
223224
refcount);
224225

225-
mutex_lock(&session_list_mutex);
226226
list_del(&sess->list_node);
227227
mutex_unlock(&session_list_mutex);
228228
kfree(sess);
@@ -272,7 +272,8 @@ int amdtee_open_session(struct tee_context *ctx,
272272
if (arg->ret != TEEC_SUCCESS) {
273273
pr_err("open_session failed %d\n", arg->ret);
274274
handle_unload_ta(ta_handle);
275-
kref_put(&sess->refcount, destroy_session);
275+
kref_put_mutex(&sess->refcount, destroy_session,
276+
&session_list_mutex);
276277
goto out;
277278
}
278279

@@ -290,7 +291,8 @@ int amdtee_open_session(struct tee_context *ctx,
290291
pr_err("reached maximum session count %d\n", TEE_NUM_SESSIONS);
291292
handle_close_session(ta_handle, session_info);
292293
handle_unload_ta(ta_handle);
293-
kref_put(&sess->refcount, destroy_session);
294+
kref_put_mutex(&sess->refcount, destroy_session,
295+
&session_list_mutex);
294296
rc = -ENOMEM;
295297
goto out;
296298
}
@@ -331,7 +333,7 @@ int amdtee_close_session(struct tee_context *ctx, u32 session)
331333
handle_close_session(ta_handle, session_info);
332334
handle_unload_ta(ta_handle);
333335

334-
kref_put(&sess->refcount, destroy_session);
336+
kref_put_mutex(&sess->refcount, destroy_session, &session_list_mutex);
335337

336338
return 0;
337339
}

0 commit comments

Comments
 (0)