summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJianglei Nie <niejianglei2021@163.com>2022-07-05 12:43:06 +0300
committerLyude Paul <lyude@redhat.com>2022-07-07 22:57:27 +0300
commit6dc548745d5b5102e3c53dc5097296ac270b6c69 (patch)
treeaa30d9ae7fa44eefdc8ddf0269b50ab2a08b369c
parent540dfd188ea2940582841c1c220bd035a7db0e51 (diff)
downloadlinux-6dc548745d5b5102e3c53dc5097296ac270b6c69.tar.xz
drm/nouveau/nouveau_bo: fix potential memory leak in nouveau_bo_alloc()
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: Jianglei Nie <niejianglei2021@163.com> Signed-off-by: Lyude Paul <lyude@redhat.com> Reviewed-by: Lyude Paul <lyude@redhat.com> Link: https://patchwork.freedesktop.org/patch/msgid/20220705094306.2244103-1-niejianglei2021@163.com
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_bo.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
index 05076e530e7d..d0887438b07e 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bo.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
@@ -281,8 +281,10 @@ nouveau_bo_alloc(struct nouveau_cli *cli, u64 *size, int *align, u32 domain,
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) {