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

radeonsi: Check aux_context on si_destroy_screen()

Browse source 
The function radeonsi_screen_create_impl() tries to create the
aux_context but doesn't actually check for the returned value from
si_create_context().

Then, on si_destroy_screen() the aux_context is used without actually
checking whether it's a thing or not.

As a result, if for any reason si_create_context() failed, we shall
crash in si_destroy_screen() with a NULL pointer dereference trying to
access ((struct si_context *)sscreen->aux_context)->log.

Simply check for aux_context not being NULL to avoid that crash.

Cc: mesa-stable
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11948>
(cherry picked from commit 5bfd1a7e19)
This commit is contained in:
Olivier Fourdan 2021-07-19 09:29:46 +02:00 • committed by Eric Engestrom
parent 74e17ceebc
commit 67250fe5bb
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -859,7 +859,7 @@
"description": "radeonsi: Check aux_context on si_destroy_screen()",
"nominated": true,
"nomination_type": 0,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null
},

16
src/gallium/drivers/radeonsi/si_pipe.c
View file

@ -842,14 +842,16 @@ static void si_destroy_screen(struct pipe_screen *pscreen)
simple_mtx_destroy(&sscreen->aux_context_lock);
struct u_log_context *aux_log = ((struct si_context *)sscreen->aux_context)->log;
if (aux_log) {
sscreen->aux_context->set_log_context(sscreen->aux_context, NULL);
u_log_context_destroy(aux_log);
FREE(aux_log);
}
if (sscreen->aux_context) {
struct u_log_context *aux_log = ((struct si_context *)sscreen->aux_context)->log;
if (aux_log) {
sscreen->aux_context->set_log_context(sscreen->aux_context, NULL);
u_log_context_destroy(aux_log);
FREE(aux_log);
}
sscreen->aux_context->destroy(sscreen->aux_context);
sscreen->aux_context->destroy(sscreen->aux_context);
}
util_queue_destroy(&sscreen->shader_compiler_queue);
util_queue_destroy(&sscreen->shader_compiler_queue_low_priority);