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

mesa: Fix stack corruption for PIPE_QUERY_TIMESTAMP

Browse source 
get_query_result expects a pointer to a union pipe_query_result,
which is larger than GLuint64EXT, causing the memset it does to
overwrite the stack.

Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19055>
This commit is contained in:
Giancarlo Devich 2022-10-12 13:28:41 -07:00 • committed by Marge Bot
parent a0c52ee827
commit 6f598fe4e3
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/mesa/main/queryobj.c
View file

@ -321,10 +321,9 @@ get_query_result(struct pipe_context *pipe,
if (q->Target == GL_TIME_ELAPSED &&
q->type == PIPE_QUERY_TIMESTAMP) {
/* Calculate the elapsed time from the two timestamp queries */
GLuint64EXT Result0 = 0;
assert(q->pq_begin);
pipe->get_query_result(pipe, q->pq_begin, TRUE, (void *)&Result0);
q->Result -= Result0;
pipe->get_query_result(pipe, q->pq_begin, TRUE, &data);
q->Result -= data.u64;
} else {
assert(!q->pq_begin);
}