Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 92f3373c authored by Karol Herbst's avatar Karol Herbst Committed by Greg Kroah-Hartman
Browse files

drm/nouveau/mem: guard against NULL pointer access in mem_del 



commit d10285a25e29f13353bbf7760be8980048c1ef2f upstream.

other drivers seems to do something similar

Signed-off-by: default avatarKarol 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: default avatarDave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201006220528.13925-2-kherbst@redhat.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c3752857

drivers/gpu/drm/nouveau/nouveau_mem.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -176,6 +176,8 @@ void 
nouveau_mem_del(struct ttm_mem_reg *reg)

nouveau_mem_del(struct ttm_mem_reg *reg)

{

{

	struct nouveau_mem *mem = nouveau_mem(reg);

	struct nouveau_mem *mem = nouveau_mem(reg);

	if (!mem)

		return;

	nouveau_mem_fini(mem);

	nouveau_mem_fini(mem);

	kfree(reg->mm_node);

	kfree(reg->mm_node);

	reg->mm_node = NULL;

	reg->mm_node = NULL;