[PATCH] drm/nouveau: fix error path in nvkm_gsp_fwsec_v2

[Zhi Wang]

On Tue, 15 Jul 2025 16:05:58 -0500
Timur Tabi <ttabi at nvidia.com> wrote:

> Function nvkm_gsp_fwsec_v2() sets 'ret' if the kmemdup() call fails,
> but it never uses or returns 'ret' after that point.  We always need
> to release the firmware regardless, so do that and then check for
> error.
> 

LGTM. Reviewed-by: Zhi Wang <zhiw at nvidia.com>

> Fixes: 176fdcbddfd2 ("drm/nouveau/gsp/r535: add support for booting
> GSP-RM") Signed-off-by: Timur Tabi <ttabi at nvidia.com>
> ---
>  drivers/gpu/drm/nouveau/nvkm/subdev/gsp/fwsec.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/fwsec.c
> b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/fwsec.c index
> 52412965fac1..5b721bd9d799 100644 ---
> a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/fwsec.c +++
> b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/fwsec.c @@ -209,11 +209,12
> @@ nvkm_gsp_fwsec_v2(struct nvkm_gsp *gsp, const char *name,
> fw->boot_addr = bld->start_tag << 8; fw->boot_size = bld->code_size;
>  	fw->boot = kmemdup(bl->data + hdr->data_offset +
> bld->code_off, fw->boot_size, GFP_KERNEL);
> -	if (!fw->boot)
> -		ret = -ENOMEM;
>  
>  	nvkm_firmware_put(bl);
>  
> +	if (!fw->boot)
> +		return -ENOMEM;
> +
>  	/* Patch in interface data. */
>  	return nvkm_gsp_fwsec_patch(gsp, fw, desc->InterfaceOffset,
> init_cmd); }
> 
> base-commit: 155a3c003e555a7300d156a5252c004c392ec6b0