ANDROID: sched: Fix wake_q length tracking
The current approach to carry the wake_q length is exposed to an intertask stack access. For example, if A sets the wake_q_head for B but is preempted before it is able to set it back to NULL, then B continues to point to an address corresponding to A's stack. If B is then woken up by another task, it ends up accessing the address pointing to A's stack. This causes a memory fault. Replace this with a simple parameter which indicates the number of tasks that are being woken up as part of the same event. This avoids saving and accessing on stack pointers. Bug: 173981591 Change-Id: I0031747d79a27673e680f7b1121eb4896ac7c699 Signed-off-by: Shaleen Agrawal <shalagra@codeaurora.org>
This commit is contained in:

committed by
Quentin Perret

parent
92da9d60e0
commit
1e674650ff
@@ -1008,7 +1008,7 @@ struct task_struct {
|
||||
raw_spinlock_t pi_lock;
|
||||
|
||||
struct wake_q_node wake_q;
|
||||
struct wake_q_head *wake_q_head;
|
||||
int wake_q_count;
|
||||
|
||||
#ifdef CONFIG_RT_MUTEXES
|
||||
/* PI waiters blocked on a rt_mutex held by this task: */
|
||||
|
@@ -601,14 +601,14 @@ void wake_up_q(struct wake_q_head *head)
|
||||
/* Task can safely be re-inserted now: */
|
||||
node = node->next;
|
||||
task->wake_q.next = NULL;
|
||||
task->wake_q_head = head;
|
||||
task->wake_q_count = head->count;
|
||||
|
||||
/*
|
||||
* wake_up_process() executes a full barrier, which pairs with
|
||||
* the queueing in wake_q_add() so as not to miss wakeups.
|
||||
*/
|
||||
wake_up_process(task);
|
||||
task->wake_q_head = NULL;
|
||||
task->wake_q_count = 0;
|
||||
put_task_struct(task);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user