From 384f64c12cddfbc30d8605c689fb66b0f712fedc Mon Sep 17 00:00:00 2001 From: Pavankumar Kondeti Date: Wed, 7 Apr 2021 09:37:15 +0530 Subject: [PATCH] ANDROID: sched: Initialize arguments of android_rvh_replace_next_task_fair android_rvh_replace_next_task_fair() hooks allows vendor modules to replace the next task selected by the CFS. There are two cases in how this hook is called. 1. When the previous task is also a CFS task. In this case, the task_struct (p) and sched_entity (se) arguments passed to this hook are valid and point to the task selected by the CFS. 2. When the previous task is not a CFS task. In this case, the arguments passed to this hook are not initialized. Initialize these arguments to NULL which allows vendor modules when not to peek into the selected task by CFS. Bug: 184695001 Fixes: 09e27d4f36d2 ("ANDROID: vendor_hooks: Add hooks for scheduler") Change-Id: Ib51dacb607663a2a6434e49198f59b36fb8c9312 Signed-off-by: Pavankumar Kondeti Signed-off-by: Shaleen Agrawal --- kernel/sched/fair.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index c4a4521d2eb5..c95486b7a335 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -7351,8 +7351,8 @@ struct task_struct * pick_next_task_fair(struct rq *rq, struct task_struct *prev, struct rq_flags *rf) { struct cfs_rq *cfs_rq = &rq->cfs; - struct sched_entity *se; - struct task_struct *p; + struct sched_entity *se = NULL; + struct task_struct *p = NULL; int new_tasks; bool repick = false;