Skip to content

Commit

Permalink
drm/nouveau/acr: Fix undefined behavior in nvkm_acr_hsfw_load_bl()
Browse files Browse the repository at this point in the history
[ Upstream commit 2343bcd ]

In nvkm_acr_hsfw_load_bl(), the return value of kmalloc() is directly
passed to memcpy(), which could lead to undefined behavior on failure
of kmalloc().

Fix this bug by using kmemdup() instead of kmalloc()+memcpy().

This bug was found by a static analyzer.

Builds with 'make allyesconfig' show no new warnings,
and our static analyzer no longer warns about this code.

Fixes: 22dcda4 ("drm/nouveau/acr: implement new subdev to replace "secure boot"")
Signed-off-by: Zhou Qingyang <zhou1615@umn.edu>
Reviewed-by: Lyude Paul <lyude@redhat.com>
Signed-off-by: Lyude Paul <lyude@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220124165856.57022-1-zhou1615@umn.edu
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
zhou1615 authored and gregkh committed Apr 8, 2022
1 parent 2e05de2 commit 408ab78
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions drivers/gpu/drm/nouveau/nvkm/subdev/acr/hsfw.c
Expand Up @@ -142,11 +142,12 @@ nvkm_acr_hsfw_load_bl(struct nvkm_acr *acr, const char *name, int ver,

hsfw->imem_size = desc->code_size;
hsfw->imem_tag = desc->start_tag;
hsfw->imem = kmalloc(desc->code_size, GFP_KERNEL);
memcpy(hsfw->imem, data + desc->code_off, desc->code_size);

hsfw->imem = kmemdup(data + desc->code_off, desc->code_size, GFP_KERNEL);
nvkm_firmware_put(fw);
return 0;
if (!hsfw->imem)
return -ENOMEM;
else
return 0;
}

int
Expand Down

0 comments on commit 408ab78

Please sign in to comment.