rpms/mesa
7
0
Fork 1
Code Issues Pull Requests Releases Activity

Backport MR #26029 to fix installer crash

Browse Source 
Found by CI:
https://bodhi.fedoraproject.org/updates/FEDORA-2023-c39f82c465
This commit is contained in:
José Expósito 2023-11-03 14:38:57 +01:00
parent 933ae55743
commit 105bbeabc1
2 changed files with 46 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
0001-zink-Fix-crash-on-zink_create_screen-error-path.patch Normal file
View File

@ -0,0 +1,45 @@
From 8927e2739b4997312785ea3972044348b9f3b0b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= <jexposit@redhat.com>
Date: Fri, 3 Nov 2023 14:15:06 +0100
Subject: [PATCH] zink: Fix crash on zink_create_screen error path
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The `zink_internal_create_screen()` function can fail before
`screen->loader_lib` and/or `screen->instance` are initialized.
The `zink_destroy_screen()` doesn't check those cases and crashes.
The error was found by Fedora's CI. The back trace is available at [1].
[1] https://bodhi.fedoraproject.org/updates/FEDORA-2023-c39f82c465
Fixes: 0c2045553fe4 ("zink: use screen destructor for creation fails")
Signed-off-by: José Expósito <jexposit@redhat.com>
---
src/gallium/drivers/zink/zink_screen.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c
index 74b575ed658..0edb8d5f35e 100644
--- a/src/gallium/drivers/zink/zink_screen.c
+++ b/src/gallium/drivers/zink/zink_screen.c
@@ -1520,10 +1520,14 @@ zink_destroy_screen(struct pipe_screen *pscreen)
if (screen->dev)
VKSCR(DestroyDevice)(screen->dev, NULL);
- VKSCR(DestroyInstance)(screen->instance, NULL);
+ if (screen->instance)
+ VKSCR(DestroyInstance)(screen->instance, NULL);
+
util_idalloc_mt_fini(&screen->buffer_ids);
- util_dl_close(screen->loader_lib);
+ if (screen->loader_lib)
+ util_dl_close(screen->loader_lib);
+
if (screen->drm_fd != -1)
close(screen->drm_fd);
--
2.41.0

1
mesa.spec
View File

@ -75,6 +75,7 @@ Source1: Mesa-MLAA-License-Clarification-Email.txt
Patch10: gnome-shell-glthread-disable.patch
Patch11: 0001-nir-add-deref-follower-builder-for-casts.patch
Patch12: 0001-zink-Fix-crash-on-zink_create_screen-error-path.patch
BuildRequires: meson >= 1.2.0
BuildRequires: gcc