Jianglei Nie
2022-Jul-05 09:58 UTC
[Nouveau] [PATCH] 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 at 163.com>
---
drivers/gpu/drm/nouveau/nouveau_bo.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
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) {
--
2.25.1
Lyude Paul
2022-Jul-07 19:55 UTC
[Nouveau] [PATCH] drm/nouveau/nouveau_bo: fix potential memory leak in nouveau_bo_alloc()
Reviewed-by: Lyude Paul <lyude at redhat.com> Will push On Tue, 2022-07-05 at 17:43 +0800, Jianglei Nie wrote:> 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 at 163.com> > --- > ?drivers/gpu/drm/nouveau/nouveau_bo.c | 4 +++- > ?1 file changed, 3 insertions(+), 1 deletion(-) > > 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) {-- Cheers, Lyude Paul (she/her) Software Engineer at Red Hat