diff options
| author | Dave Airlie <airlied@redhat.com> | 2022-02-14 03:52:27 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2022-02-14 03:52:27 +0300 |
| commit | b9c7babe2c2e37a50aa42401b38d597ea78f506e (patch) | |
| tree | dd6ec30f2583f8860e69a74e4779ac20e3f53bff /drivers/gpu/drm/nouveau | |
| parent | 123db17ddff007080d464e785689fb14f94cbc7a (diff) | |
| parent | 754e0b0e35608ed5206d6a67a791563c631cec07 (diff) | |
| download | linux-b9c7babe2c2e37a50aa42401b38d597ea78f506e.tar.xz | |
Backmerge tag 'v5.17-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into drm-next
Daniel asked for this for some intel deps, so let's do it now.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/bios/base.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/base.c index d0f52d59fc2f..64e423dddd9e 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/base.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/base.c @@ -38,7 +38,7 @@ nvbios_addr(struct nvkm_bios *bios, u32 *addr, u8 size) *addr += bios->imaged_addr; } - if (unlikely(*addr + size >= bios->size)) { + if (unlikely(*addr + size > bios->size)) { nvkm_error(&bios->subdev, "OOB %d %08x %08x\n", size, p, *addr); return false; } |