fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 20:08:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

st/mesa: Fix signed integer overflow when using util_throttle_memory_usage

Browse source 
../src/mesa/state_tracker/st_cb_texture.c:1719:57: runtime error: signed integer overflow: 203489280 * 16 cannot be represented in type 'int'

Fixes: 21ca322e63
Signed-off-by: Danylo Piliaiev <danylo.piliaiev@globallogic.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4185>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4185>
(cherry picked from commit 51b1b102bd)
This commit is contained in:
Danylo Piliaiev 2020-03-13 17:10:08 +02:00 • committed by Dylan Baker
parent 872de20b21
commit 3cfca286af
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -202,7 +202,7 @@
"description": "st/mesa: Fix signed integer overflow when using util_throttle_memory_usage", "description": "st/mesa: Fix signed integer overflow when using util_throttle_memory_usage",
"nominated": true, "nominated": true,
"nomination_type": 1, "nomination_type": 1,
"resolution": 0, "resolution": 1,
"master_sha": null, "master_sha": null,
"because_sha": "21ca322e637291b89a445159fc45b8dbf638e6c9" "because_sha": "21ca322e637291b89a445159fc45b8dbf638e6c9"
}, },

6
src/mesa/state_tracker/st_cb_texture.c
View file

@ -1511,7 +1511,7 @@ st_TexSubImage(struct gl_context *ctx, GLuint dims,
} }
util_throttle_memory_usage(pipe, &st->throttle, util_throttle_memory_usage(pipe, &st->throttle,
width * height * depth * (uint64_t) width * height * depth *
util_format_get_blocksize(dst->format)); util_format_get_blocksize(dst->format));
u_box_3d(xoffset, yoffset, zoffset + dstz, width, height, depth, &box); u_box_3d(xoffset, yoffset, zoffset + dstz, width, height, depth, &box);
@ -1620,7 +1620,7 @@ st_TexSubImage(struct gl_context *ctx, GLuint dims,
} }
util_throttle_memory_usage(pipe, &st->throttle, util_throttle_memory_usage(pipe, &st->throttle,
width * height * depth * (uint64_t) width * height * depth *
util_format_get_blocksize(src_templ.format)); util_format_get_blocksize(src_templ.format));
throttled = true; throttled = true;
@ -1716,7 +1716,7 @@ st_TexSubImage(struct gl_context *ctx, GLuint dims,
fallback: fallback:
if (!throttled) { if (!throttled) {
util_throttle_memory_usage(pipe, &st->throttle, util_throttle_memory_usage(pipe, &st->throttle,
width * height * depth * (uint64_t) width * height * depth *
_mesa_get_format_bytes(texImage->TexFormat)); _mesa_get_format_bytes(texImage->TexFormat));
} }
_mesa_store_texsubimage(ctx, dims, texImage, xoffset, yoffset, zoffset, _mesa_store_texsubimage(ctx, dims, texImage, xoffset, yoffset, zoffset,