radeonsi: Check aux_context on si_destroy_screen()
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>
This commit is contained in:
parent
8be61e8a9e
commit
5bfd1a7e19
|
@ -862,14 +862,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);
|
||||
|
|
Loading…
Reference in New Issue