projects
/
platform
/
kernel
/
linux-starfive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
30bdc36
)
drm/nouveau: fix another off-by-one in nvbios_addr
author
Timur Tabi
<ttabi@nvidia.com>
Wed, 11 May 2022 16:37:16 +0000
(11:37 -0500)
committer
Karol Herbst
<kherbst@redhat.com>
Thu, 4 Aug 2022 16:28:24 +0000
(18:28 +0200)
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:
4d4e9907ff572
("drm/nouveau/bios: guard against out-of-bounds accesses to image")
Signed-off-by: Timur Tabi <ttabi@nvidia.com>
Reviewed-by: Karol Herbst <kherbst@redhat.com>
Signed-off-by: Karol Herbst <kherbst@redhat.com>
Link:
https://patchwork.freedesktop.org/patch/msgid/20220511163716.3520591-1-ttabi@nvidia.com
drivers/gpu/drm/nouveau/nvkm/subdev/bios/base.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/base.c
b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/base.c
index
64e423d
..
6c318e4
100644
(file)
--- a/
drivers/gpu/drm/nouveau/nvkm/subdev/bios/base.c
+++ b/
drivers/gpu/drm/nouveau/nvkm/subdev/bios/base.c
@@
-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;
}