summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorKarol Herbst <kherbst@redhat.com>2020-10-07 00:05:28 +0200
committerDave Airlie <airlied@redhat.com>2020-10-07 15:33:09 +1000
commitd10285a25e29f13353bbf7760be8980048c1ef2f (patch)
tree15e80ff3046207c1e31076a0c4331d863b3c904c /drivers
parentc3e0276c31ca8c7b8615da890727481260d4676f (diff)
downloadlinux-d10285a25e29f13353bbf7760be8980048c1ef2f.tar.bz2
drm/nouveau/mem: guard against NULL pointer access in mem_del
other drivers seems to do something similar Signed-off-by: Karol Herbst <kherbst@redhat.com> Cc: dri-devel <dri-devel@lists.freedesktop.org> Cc: Dave Airlie <airlied@redhat.com> Cc: stable@vger.kernel.org Signed-off-by: Dave Airlie <airlied@redhat.com> Link: https://patchwork.freedesktop.org/patch/msgid/20201006220528.13925-2-kherbst@redhat.com
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_mem.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_mem.c b/drivers/gpu/drm/nouveau/nouveau_mem.c
index b1bb542d3115..e5fae57fffbd 100644
--- a/drivers/gpu/drm/nouveau/nouveau_mem.c
+++ b/drivers/gpu/drm/nouveau/nouveau_mem.c
@@ -176,6 +176,8 @@ void
nouveau_mem_del(struct ttm_mem_reg *reg)
{
struct nouveau_mem *mem = nouveau_mem(reg);
+ if (!mem)
+ return;
nouveau_mem_fini(mem);
kfree(reg->mm_node);
reg->mm_node = NULL;