Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8afbf206 authored by Timur Tabi's avatar Timur Tabi Committed by Greg Kroah-Hartman
Browse files

drm/nouveau: fix another off-by-one in nvbios_addr 



commit c441d28945fb113220d48d6c86ebc0b090a2b677 upstream.

This check determines whether a given address is part of
image 0 or image 1.  Image 1 starts at offset image0_size,
so that address should be included.

Fixes: 4d4e9907 ("drm/nouveau/bios: guard against out-of-bounds accesses to image")
Cc: <stable@vger.kernel.org> # v4.8+
Signed-off-by: default avatarTimur Tabi <ttabi@nvidia.com>
Reviewed-by: default avatarKarol Herbst <kherbst@redhat.com>
Signed-off-by: default avatarLyude Paul <lyude@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220511163716.3520591-1-ttabi@nvidia.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5557e946

drivers/gpu/drm/nouveau/nvkm/subdev/bios/base.c

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ nvbios_addr(struct nvkm_bios *bios, u32 *addr, u8 size) 
{

	u32 p = *addr;



	if (*addr > bios->image0_size && bios->imaged_addr) {

	if (*addr >= bios->image0_size && bios->imaged_addr) {

		*addr -= bios->image0_size;

		*addr += bios->imaged_addr;

	}