github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-31 11:37:06 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ANDROID: binder: fix pending prio state for early exit

Browse Source 
When calling binder_do_set_priority() with the same policy and priority
values as the current task, we exit early since there is nothing to do.
However, the BINDER_PRIO_PENDING state might be set and in this case we
fail to update it. A subsequent call to binder_transaction_priority()
will then read an incorrect state and save the wrong priority. Fix this
by setting thread->prio_state to BINDER_PRIO_SET on our way out.

Bug: 199309216
Fixes: cac827f261 ("ANDROID: binder: fix race in priority restore")
Signed-off-by: Carlos Llamas <cmllamas@google.com>
Change-Id: I21e906cf4b2ebee908af41fe101ecd458ae1991c
This commit is contained in:
Carlos Llamas 2022-07-22 01:19:38 +00:00
parent 3b27623096
commit 72193be6d4
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/android/binder.c
View File

@ -684,8 +684,13 @@ static void binder_do_set_priority(struct binder_thread *thread,
bool has_cap_nice;
unsigned int policy = desired->sched_policy;
if (task->policy == policy && task->normal_prio == desired->prio)
if (task->policy == policy && task->normal_prio == desired->prio) {
spin_lock(&thread->prio_lock);
if (thread->prio_state == BINDER_PRIO_PENDING)
thread->prio_state = BINDER_PRIO_SET;
spin_unlock(&thread->prio_lock);
return;
}
has_cap_nice = has_capability_noaudit(task, CAP_SYS_NICE);