drm/sched: fix NULL deref when logging missing entity runqueue
Subsystems (3)
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
@@ -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
Quoted 14 lines · Candice Li
job->schedis not initialized untildrm_sched_job_arm(), so usepr_err()instead ofdev_err(job->sched->dev, ...)whenentity->rqis NULL.Signed-off-by Candice Li <[email protected]>--- drivers/gpu/drm/scheduler/sched_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/scheduler/sched_main.c +0
-0
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
Quoted 3 lines · Candice Li
job->schedis not initialized untildrm_sched_job_arm(), so usepr_err()instead ofdev_err(job->sched->dev, ...)whenentity->rqis NULL.
You need to CC the designated maintainer on stuff like that! Please use get_maintainer.pl script.
Regards,
Christian.
Quoted 19 lines
Signed-off-by Candice Li <[email protected]>--- drivers/gpu/drm/scheduler/sched_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)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 ; }
Quoted 6 lines · Christian König
Quoted 3 lines · Candice Li
job->schedis not initialized untildrm_sched_job_arm(), so usepr_err()instead ofdev_err(job->sched->dev, ...)whenentity->rqis 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
Signed-off-by Candice Li <[email protected]>---
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@@ -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
-0return -ENOENT; }
+Cc Tvrtko
Quoted 20 lines · Philipp Stanner
Quoted 6 lines · Christian König
Quoted 3 lines · Candice Li
job->schedis not initialized untildrm_sched_job_arm(), so usepr_err()instead ofdev_err(job->sched->dev, ...)whenentity->rqis 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
Signed-off-by Candice Li <[email protected]>---
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@@ -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_erretc. markers contain the qualifiers like_err,_warnetc. 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
-0return -ENOENT; }