linux-kernel - [PATCH 1/2] drm/sched: Use proper locks in drm_sched_job

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-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20251030104219.181704-3-phasta@kernel.org>
Date: Thu, 30 Oct 2025 11:42:19 +0100
From: Philipp Stanner <phasta@...nel.org>
To: Matthew Brost <matthew.brost@...el.com>,
	Danilo Krummrich <dakr@...nel.org>,
	Philipp Stanner <phasta@...nel.org>,
	Christian König <ckoenig.leichtzumerken@...il.com>,
	Maarten Lankhorst <maarten.lankhorst@...ux.intel.com>,
	Maxime Ripard <mripard@...nel.org>,
	Thomas Zimmermann <tzimmermann@...e.de>,
	David Airlie <airlied@...il.com>,
	Simona Vetter <simona@...ll.ch>,
	Boris Brezillon <boris.brezillon@...labora.com>,
	Melissa Wen <mwen@...lia.com>,
	Steven Price <steven.price@....com>
Cc: dri-devel@...ts.freedesktop.org,
	linux-kernel@...r.kernel.org,
	stable@...r.kernel.org
Subject: [PATCH 1/2] drm/sched: Use proper locks in drm_sched_job_arm()

drm_sched_job_arm() is just racing when dereferencing entity and
runqueue.

Add the proper spinlocks.

Cc: stable@...r.kernel.org # v5.16+
Fixes: dbe48d030b28 ("drm/sched: Split drm_sched_job_init")
Signed-off-by: Philipp Stanner <phasta@...nel.org>
---
 drivers/gpu/drm/scheduler/sched_main.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/scheduler/sched_main.c b/drivers/gpu/drm/scheduler/sched_main.c
index c39f0245e3a9..7f938f491b6f 100644
--- a/drivers/gpu/drm/scheduler/sched_main.c
+++ b/drivers/gpu/drm/scheduler/sched_main.c
@@ -859,10 +859,16 @@ void drm_sched_job_arm(struct drm_sched_job *job)
 
 	BUG_ON(!entity);
 	drm_sched_entity_select_rq(entity);
+
+	spin_lock(&entity->lock);
+	spin_lock(&entity->rq->lock);
 	sched = entity->rq->sched;
+	spin_unlock(&entity->rq->lock);
+
+	job->s_priority = entity->priority;
+	spin_unlock(&entity->lock);
 
 	job->sched = sched;
-	job->s_priority = entity->priority;
 
 	drm_sched_fence_init(job->s_fence, job->entity);
 }
-- 
2.49.0