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

Commit 1d0803b1 authored by Jianglei Nie's avatar Jianglei Nie Committed by Greg Kroah-Hartman
Browse files

drm/nouveau/nouveau_bo: fix potential memory leak in nouveau_bo_alloc() 



[ Upstream commit 6dc548745d5b5102e3c53dc5097296ac270b6c69 ]

nouveau_bo_alloc() allocates a memory chunk for "nvbo" with kzalloc().
When some error occurs, "nvbo" should be released. But when
WARN_ON(pi < 0)) equals true, the function return ERR_PTR without
releasing the "nvbo", which will lead to a memory leak.

We should release the "nvbo" with kfree() if WARN_ON(pi < 0)) equals true.

Signed-off-by: default avatarJianglei Nie <niejianglei2021@163.com>
Signed-off-by: default avatarLyude Paul <lyude@redhat.com>
Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220705094306.2244103-1-niejianglei2021@163.com


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 61fd56b0

drivers/gpu/drm/nouveau/nouveau_bo.c

+3 −1
Original line number Diff line number Diff line
@@ -276,8 +276,10 @@ nouveau_bo_alloc(struct nouveau_cli *cli, u64 *size, int *align, u32 flags, 
			break;

	}



	if (WARN_ON(pi < 0))

	if (WARN_ON(pi < 0)) {

		kfree(nvbo);

		return ERR_PTR(-EINVAL);

	}



	/* Disable compression if suitable settings couldn't be found. */

	if (nvbo->comp && !vmm->page[pi].comp) {