From b7d6c8db498cdbbd0004970d02c86210ce3a6cbc Mon Sep 17 00:00:00 2001 From: Alexandre Courbot Date: Fri, 10 Mar 2017 17:16:48 +0900 Subject: drm/nouveau/secboot: fix NULL pointer dereference The msgqueue pointer validity should be checked by its owner, not by the msgqueue code itself to avoid this situation. Signed-off-by: Alexandre Courbot Reported-by: Julia Lawall Signed-off-by: Dave Airlie --- drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gm20b.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'drivers/gpu/drm/nouveau/nvkm/subdev') diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gm20b.c b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gm20b.c index 48ae02d..44bef22 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gm20b.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gm20b.c @@ -27,6 +27,12 @@ static void gm20b_pmu_recv(struct nvkm_pmu *pmu) { + if (!pmu->queue) { + nvkm_warn(&pmu->subdev, + "recv function called while no firmware set!\n"); + return; + } + nvkm_msgqueue_recv(pmu->queue); } -- cgit v1.1