linux-kernel - [PATCH v4.19.y] sched/rt: pick_next_rt_entity(): check list

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20230826021535.9065-1-ssrish@vmware.com>
Date:   Sat, 26 Aug 2023 07:45:35 +0530
From:   Srish Srinivasan <ssrish@...are.com>
To:     stable@...r.kernel.org
Cc:     gregkh@...uxfoundation.org, patches@...ts.linux.dev,
        borrello@...g.uniroma1.it, peterz@...radead.org, pauld@...hat.com,
        rostedt@...dmis.org, sashal@...nel.org, mingo@...hat.com,
        linux-kernel@...r.kernel.org, akaher@...are.com,
        vsirnapalli@...are.com, amakhalov@...are.com, tkundu@...are.com,
        keerthanak@...are.com, srinidhir@...are.com,
        kashwindayan@...are.com, vbrahmajosyula@...are.com,
        Srish Srinivasan <ssrish@...are.com>
Subject: [PATCH v4.19.y] sched/rt: pick_next_rt_entity(): check list_entry

From: Pietro Borrello <borrello@...g.uniroma1.it>

commit 7c4a5b89a0b5a57a64b601775b296abf77a9fe97 upstream.

Commit 326587b84078 ("sched: fix goto retry in pick_next_task_rt()")
removed any path which could make pick_next_rt_entity() return NULL.
However, BUG_ON(!rt_se) in _pick_next_task_rt() (the only caller of
pick_next_rt_entity()) still checks the error condition, which can
never happen, since list_entry() never returns NULL.
Remove the BUG_ON check, and instead emit a warning in the only
possible error condition here: the queue being empty which should
never happen.

Fixes: 326587b84078 ("sched: fix goto retry in pick_next_task_rt()")
Signed-off-by: Pietro Borrello <borrello@...g.uniroma1.it>
Signed-off-by: Peter Zijlstra (Intel) <peterz@...radead.org>
Reviewed-by: Phil Auld <pauld@...hat.com>
Reviewed-by: Steven Rostedt (Google) <rostedt@...dmis.org>
Link: https://lore.kernel.org/r/20230128-list-entry-null-check-sched-v3-1-b1a71bd1ac6b@diag.uniroma1.it
Signed-off-by: Sasha Levin <sashal@...nel.org>
[Srish: Fixes CVE-2023-1077: sched/rt: pick_next_rt_entity(): check list_entry
	     An insufficient list empty checking in pick_next_rt_entity().
	     The _pick_next_task_rt() checks pick_next_rt_entity() returns
	     NULL or not but pick_next_rt_entity() never returns NULL.
	     So, even if the list is empty, _pick_next_task_rt() continues
	     its process.]
Signed-off-by: Srish Srinivasan <ssrish@...are.com>
---
 kernel/sched/rt.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c
index 9c6c3572b..394c66442 100644
--- a/kernel/sched/rt.c
+++ b/kernel/sched/rt.c
@@ -1522,6 +1522,8 @@ static struct sched_rt_entity *pick_next_rt_entity(struct rq *rq,
 	BUG_ON(idx >= MAX_RT_PRIO);

 	queue = array->queue + idx;
+	if (SCHED_WARN_ON(list_empty(queue)))
+		return NULL;
 	next = list_entry(queue->next, struct sched_rt_entity, run_list);

 	return next;
@@ -1535,7 +1537,8 @@ static struct task_struct *_pick_next_task_rt(struct rq *rq)

 	do {
 		rt_se = pick_next_rt_entity(rq, rt_rq);
-		BUG_ON(!rt_se);
+		if (unlikely(!rt_se))
+			return NULL;
 		rt_rq = group_rt_rq(rt_se);
 	} while (rt_rq);

--
2.35.6