Skip to contentSkip to conversation

drm/sched: fix NULL deref when logging missing entity runqueue

PATCH In review Candice Li 4 participants 5 messages Jun 3

Subsystems (3)
lore
Share & tools
lore

Candice Li

author
#0 lore raw

PATCH 1/1 drm/sched: fix NULL deref when logging missing entity runqueue

job->sched is not initialized until drm_sched_job_arm(), so use pr_err() instead of dev_err(job->sched->dev, ...) when entity->rq is NULL.

---
 drivers/gpu/drm/scheduler/sched_main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/scheduler/sched_main.c +1 -1
index bd7936c03da2aa..d21eada76cedf1 100644
@@ -806,7 +806,7 @@ int drm_sched_job_init(struct drm_sched_job *job,
 		 * or worse--a blank screen--leave a trail in the
 		 * logs, so this can be debugged easier.
 		 */
-		dev_err(job->sched->dev, "%s: entity has no rq!\n", __func__);
+		pr_err("*ERROR* %s: entity has no rq!\n", __func__);
 		return -ENOENT;
 	}
 
Signature · 1 line
2.25.1
#1 lore raw
Quoted 14 lines · Candice Li

job->sched is not initialized until drm_sched_job_arm(), so use pr_err() instead of dev_err(job->sched->dev, ...) when entity->rq is NULL.

---
  drivers/gpu/drm/scheduler/sched_main.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/scheduler/sched_main.c +0 -0
index bd7936c03da2aa..d21eada76cedf1 100644

drivers/gpu/drm/scheduler/sched_main.c int drm_sched_job_init(struct drm_sched_job *job, · line 812

Quoted 8 lines
drivers/gpu/drm/scheduler/sched_main.c +1 -1
@@ -806,7 +806,7 @@ int drm_sched_job_init(struct drm_sched_job *job,
  		 * or worse--a blank screen--leave a trail in the
  		 * logs, so this can be debugged easier.
  		 */
-		dev_err(job->sched->dev, "%s: entity has no rq!\n", __func__);
+		pr_err("*ERROR* %s: entity has no rq!\n", __func__);
  		return -ENOENT;
  	}
 

Even better, entity->rq cannot be NULL:

https://lore.kernel.org/dri-devel/[email protected]/T/#u

Regards,

Tvrtko

#2 lore raw
In reply to Candice Li
Quoted 3 lines · Candice Li

job->sched is not initialized until drm_sched_job_arm(), so use pr_err() instead of dev_err(job->sched->dev, ...) when entity->rq is NULL.

You need to CC the designated maintainer on stuff like that! Please use get_maintainer.pl script.

Regards,
Christian.

Quoted 19 lines
---
 drivers/gpu/drm/scheduler/sched_main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/scheduler/sched_main.c +1 -1
index bd7936c03da2aa..d21eada76cedf1 100644
@@ -806,7 +806,7 @@ int drm_sched_job_init(struct drm_sched_job *job,
 		 * or worse--a blank screen--leave a trail in the
 		 * logs, so this can be debugged easier.
 		 */
-		dev_err(job->sched->dev, "%s: entity has no rq!\n", __func__);
+		pr_err("*ERROR* %s: entity has no rq!\n", __func__);
 		return -ENOENT;
 	}
 
#3 lore raw
Quoted 6 lines · Christian König
Quoted 3 lines · Candice Li

job->sched is not initialized until drm_sched_job_arm(), so use pr_err() instead of dev_err(job->sched->dev, ...) when entity->rq is NULL.

You need to CC the designated maintainer on stuff like that! Please use get_maintainer.pl script.

Thx, Christian

Quoted 10 lines

Regards,
Christian.

Quoted 6 lines

---
 drivers/gpu/drm/scheduler/sched_main.c | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 10 lines

drivers/gpu/drm/scheduler/sched_main.c int drm_sched_job_init(struct drm_sched_job *job, · line 809

Quoted 10 lines
drivers/gpu/drm/scheduler/sched_main.c +1 -1
index bd7936c03da2aa..d21eada76cedf1 100644
@@ -806,7 +806,7 @@ int drm_sched_job_init(struct drm_sched_job *job,
  		 * or worse--a blank screen--leave a trail in the
  		 * logs, so this can be debugged easier.
  		 */
-		dev_err(job->sched->dev, "%s: entity has no rq!\n", __func__);
+		pr_err("*ERROR* %s: entity has no rq!\n", __func__);

I think while at it you want to remove '*ERROR*' – the pr_err etc. markers contain the qualifiers like _err, _warn etc. so that the level is already included for free.

Regards
P.

Quoted 3 lines
Quoted 3 lines
drivers/gpu/drm/scheduler/sched_main.c +0 -0
  		return -ENOENT;
  	}

#4 lore raw

+Cc Tvrtko

Quoted 20 lines · Philipp Stanner
Quoted 6 lines · Christian König
Quoted 3 lines · Candice Li

job->sched is not initialized until drm_sched_job_arm(), so use pr_err() instead of dev_err(job->sched->dev, ...) when entity->rq is NULL.

You need to CC the designated maintainer on stuff like that! Please use get_maintainer.pl script.

Thx, Christian

Quoted 10 lines

Regards,
Christian.

Quoted 6 lines

---
 drivers/gpu/drm/scheduler/sched_main.c | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 14 lines
Quoted 10 lines

drivers/gpu/drm/scheduler/sched_main.c int drm_sched_job_init(struct drm_sched_job *job, · line 809

Quoted 10 lines
drivers/gpu/drm/scheduler/sched_main.c +1 -1
index bd7936c03da2aa..d21eada76cedf1 100644
@@ -806,7 +806,7 @@ int drm_sched_job_init(struct drm_sched_job *job,
  		 * or worse--a blank screen--leave a trail in the
  		 * logs, so this can be debugged easier.
  		 */
-		dev_err(job->sched->dev, "%s: entity has no rq!\n", __func__);
+		pr_err("*ERROR* %s: entity has no rq!\n", __func__);

I think while at it you want to remove '*ERROR*' – the pr_err etc. markers contain the qualifiers like _err, _warn etc. so that the level is already included for free.

OK, I couldn't see that Tvrtko already jumped in because of his other patch.

https://lore.kernel.org/dri-devel/[email protected]/T/#u

I think Tvrtko's patch looks not very controversial and allows us to get rid of that code, so let's opt for that.

Thx
P.

Quoted 7 lines

Regards
P.

Quoted 3 lines
Quoted 3 lines
drivers/gpu/drm/scheduler/sched_main.c +0 -0
  		return -ENOENT;
  	}