Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

core: reset cancellation mask on TA entry #6694

Merged
merged 1 commit into from
Mar 28, 2024
Merged

core: reset cancellation mask on TA entry #6694

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion core/kernel/user_ta.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,11 +223,12 @@ static TEE_Result user_ta_enter(struct ts_session *session,
dec_recursion();
out_clr_cancel:
/*
* Clear the cancel state now that the user TA has returned. The next
* Reset the cancel state now that the user TA has returned. The next
* time the TA will be invoked will be with a new operation and should
* not have an old cancellation pending.
*/
ta_sess->cancel = false;
ta_sess->cancel_mask = true;

return res;
}
Expand Down
Loading