diff options
| author |   Jon Derrick <jonathan.derrick@intel.com> | 2019-03-15 18:05:18 -0600 |
|---|---|---|
| committer |   Ben Skeggs <bskeggs@redhat.com> | 2019-05-01 11:08:39 +1000 |
| commit | 15516bf9abaa41421a6ded79a5a2fee86f9594e5 (patch) | |
| tree | dfca18c39fae007c9da6d8dbe8b2ced9fdfcabb5 /drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c | |
| parent | drm/nouveau/bar/gf100: ensure BAR is mapped (diff) | |
| download | linux-dev-15516bf9abaa41421a6ded79a5a2fee86f9594e5.tar.xz linux-dev-15516bf9abaa41421a6ded79a5a2fee86f9594e5.zip | |
drm/nouveau/mmu: qualify vmm during dtor
If the BAR initialization failed it may leave the vmm structure in an
unitialized state, leading to a null-pointer-dereference when the vmm is
dereferenced during teardown.
Signed-off-by: Jon Derrick <jonathan.derrick@intel.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c index fa93f964e6a4..41640e0584ac 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c @@ -1783,7 +1783,7 @@ nvkm_vmm_get(struct nvkm_vmm *vmm, u8 page, u64 size, struct nvkm_vma **pvma) void nvkm_vmm_part(struct nvkm_vmm *vmm, struct nvkm_memory *inst) { - if (inst && vmm->func->part) { + if (inst && vmm && vmm->func->part) { mutex_lock(&vmm->mutex); vmm->func->part(vmm, inst); mutex_unlock(&vmm->mutex); |