[PATCH] drm/scheduler: add NULL pointer check for run queue (v2)

Christian König christian.koenig at amd.com
Mon Jul 16 09:27:11 UTC 2018


Am 16.07.2018 um 11:23 schrieb Junwei Zhang:
> To check rq pointer before adding entity into it.
> That avoids NULL pointer access in some case.
>
> v2: move the check to caller
>
> Suggested-by: Christian König <christian.koenig at amd.com>
> Signed-off-by: Junwei Zhang <Jerry.Zhang at amd.com>

Reviewed-by: Christian König <christian.koenig at amd.com>

> ---
>   drivers/gpu/drm/scheduler/gpu_scheduler.c | 5 +++++
>   1 file changed, 5 insertions(+)
>
> diff --git a/drivers/gpu/drm/scheduler/gpu_scheduler.c b/drivers/gpu/drm/scheduler/gpu_scheduler.c
> index 16bf446..dac71e3 100644
> --- a/drivers/gpu/drm/scheduler/gpu_scheduler.c
> +++ b/drivers/gpu/drm/scheduler/gpu_scheduler.c
> @@ -547,6 +547,11 @@ void drm_sched_entity_push_job(struct drm_sched_job *sched_job,
>   	if (first) {
>   		/* Add the entity to the run queue */
>   		spin_lock(&entity->rq_lock);
> +		if (!entity->rq) {
> +			DRM_ERROR("Trying to push to a killed entity\n");
> +			spin_unlock(&entity->rq_lock);
> +			return;
> +		}
>   		drm_sched_rq_add_entity(entity->rq, entity);
>   		spin_unlock(&entity->rq_lock);
>   		drm_sched_wakeup(sched);



More information about the amd-gfx mailing list