OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: fix out of bounds stack access on big endian

Browse Source 
The texture format code relies on a python-generated atlas of structs
that describe a lookup table for texture swizzling. Many of these
texture formats contain the index "6" used for this lookup. The 6th
index just so happens to represent a "don't care" value, however the
out of bounds read is still best to be avoided. The address sanitizer
finds this issue pretty immediately but it only shows up on big endian
because the textures don't need this on little.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20846>
This commit is contained in:
Adam Stylinski
2023-01-22 21:07:22 -05:00
committed by Marge Bot
parent 6c80f7c555
commit 56e758d9e9
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/mesa/main/formats.c
View File

@@ -412,7 +412,7 @@ _mesa_array_format_flip_channels(mesa_array_format format)
for (unsigned i = 0; i < 4; i++)
assert(swizzle[i] != 2 && swizzle[i] != 3);
static const uint8_t flip_xy[6] = { 1, 0, 2, 3, 4, 5 };
static const uint8_t flip_xy[7] = { 1, 0, 2, 3, 4, 5, 6 };
_mesa_array_format_set_swizzle(&format,
flip_xy[swizzle[0]], flip_xy[swizzle[1]],
flip_xy[swizzle[2]], flip_xy[swizzle[3]]);
@@ -420,7 +420,7 @@ _mesa_array_format_flip_channels(mesa_array_format format)
}
if (num_channels == 4) {
static const uint8_t flip[6] = { 3, 2, 1, 0, 4, 5 };
static const uint8_t flip[7] = { 3, 2, 1, 0, 4, 5, 6 };
_mesa_array_format_set_swizzle(&format,
flip[swizzle[0]], flip[swizzle[1]],
flip[swizzle[2]], flip[swizzle[3]]);