Skip to content

Commit b09382c

Browse files
ttabigregkh
authored andcommitted
drm/nouveau: fix error path in nvkm_gsp_fwsec_v2
commit 66e82b6 upstream. 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. Fixes: 176fdcb ("drm/nouveau/gsp/r535: add support for booting GSP-RM") Cc: stable@vger.kernel.org # v6.7+ Signed-off-by: Timur Tabi <ttabi@nvidia.com> Link: https://lore.kernel.org/r/20250813001004.2986092-1-ttabi@nvidia.com Signed-off-by: Danilo Krummrich <dakr@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 6badb50 commit b09382c

File tree

1 file changed

+3
-2
lines changed
  • drivers/gpu/drm/nouveau/nvkm/subdev/gsp

1 file changed

+3
-2
lines changed

drivers/gpu/drm/nouveau/nvkm/subdev/gsp/fwsec.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,11 +209,12 @@ nvkm_gsp_fwsec_v2(struct nvkm_gsp *gsp, const char *name,
209209
fw->boot_addr = bld->start_tag << 8;
210210
fw->boot_size = bld->code_size;
211211
fw->boot = kmemdup(bl->data + hdr->data_offset + bld->code_off, fw->boot_size, GFP_KERNEL);
212-
if (!fw->boot)
213-
ret = -ENOMEM;
214212

215213
nvkm_firmware_put(bl);
216214

215+
if (!fw->boot)
216+
return -ENOMEM;
217+
217218
/* Patch in interface data. */
218219
return nvkm_gsp_fwsec_patch(gsp, fw, desc->InterfaceOffset, init_cmd);
219220
}

0 commit comments

Comments
 (0)