drm/nouveau/secboot/acr: fix memory leak

GustavoARSilva · gregkh · commit 05dff1e2018b · 2018-11-21T09:19:09.000+01:00
[ Upstream commit 74a07c0 ] In case memory resources for *bl_desc* were allocated, release them before return. Addresses-Coverity-ID: 1472021 ("Resource leak") Fixes: 0d46690 ("drm/nouveau/secboot/acr: Remove VLA usage") Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com> Reviewed-by: John Hubbard <jhubbard@nvidia.com> Reviewed-by: Kees Cook <keescook@chromium.org> Signed-off-by: Ben Skeggs <bskeggs@redhat.com> Signed-off-by: Sasha Levin <sashal@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r352.c b/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r352.c
@@ -801,6 +801,7 @@ acr_r352_load(struct nvkm_acr *_acr, struct nvkm_falcon *falcon,
 		bl = acr->hsbl_unload_blob;
 	} else {
 		nvkm_error(_acr->subdev, "invalid secure boot blob!\n");
+		kfree(bl_desc);
 		return -EINVAL;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -801,6 +801,7 @@ acr_r352_load(struct nvkm_acr _acr, struct nvkm_falcon falcon,`
`801`	`801`	`bl = acr->hsbl_unload_blob;`
`802`	`802`	`} else {`
`803`	`803`	`nvkm_error(_acr->subdev, "invalid secure boot blob!\n");`
	`804`	`+ kfree(bl_desc);`
`804`	`805`	`return -EINVAL;`
`805`	`806`	`}`
`806`	`807`