From fd6e1b261b8fdcb4414a25e2577ef0b37ad0ab94 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Wed, 6 Oct 2021 17:19:24 +1000 Subject: [PATCH] add fix for leaking fd in vulkan device select --- ..._select-close-dri3-fd-after-using-it.patch | 28 +++++++++++++++++++ mesa.spec | 6 +++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 0001-device_select-close-dri3-fd-after-using-it.patch diff --git a/0001-device_select-close-dri3-fd-after-using-it.patch b/0001-device_select-close-dri3-fd-after-using-it.patch new file mode 100644 index 0000000..bf98a9e --- /dev/null +++ b/0001-device_select-close-dri3-fd-after-using-it.patch @@ -0,0 +1,28 @@ +From 7a97778f9175b29b2c0769711b5045a8a70e8d29 Mon Sep 17 00:00:00 2001 +From: Dave Airlie +Date: Wed, 6 Oct 2021 17:13:46 +1000 +Subject: [PATCH] device_select: close dri3 fd after using it. + +This can leak and causes crashes in some CTS test groups +dEQP-VK.wsi.xcb.incremental_present* + +Fixes: 9bc5b2d169d3 ("vulkan: add initial device selection layer. (v6.1)") +--- + src/vulkan/device-select-layer/device_select_x11.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/vulkan/device-select-layer/device_select_x11.c b/src/vulkan/device-select-layer/device_select_x11.c +index 93b39f269a4..b17402e7b06 100644 +--- a/src/vulkan/device-select-layer/device_select_x11.c ++++ b/src/vulkan/device-select-layer/device_select_x11.c +@@ -93,6 +93,7 @@ int device_select_find_xcb_pci_default(struct device_pci_info *devices, uint32_t + + drmDevicePtr xdev; + int ret = drmGetDevice2(dri3_fd, 0, &xdev); ++ close(dri3_fd); + if (ret < 0) + goto out; + +-- +2.31.1 + diff --git a/mesa.spec b/mesa.spec index d5dc76d..6bcffa0 100644 --- a/mesa.spec +++ b/mesa.spec @@ -58,7 +58,7 @@ Name: mesa Summary: Mesa graphics libraries %global ver 21.1.8 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} -Release: 1%{?dist} +Release: 2%{?dist} License: MIT URL: http://www.mesa3d.org @@ -68,6 +68,7 @@ Source0: https://mesa.freedesktop.org/archive/%{name}-%{ver}.tar.xz # Fedora opts to ignore the optional part of clause 2 and treat that code as 2 clause BSD. Source1: Mesa-MLAA-License-Clarification-Email.txt +Patch1: 0001-device_select-close-dri3-fd-after-using-it.patch BuildRequires: meson >= 0.45 BuildRequires: gcc BuildRequires: gcc-c++ @@ -602,6 +603,9 @@ popd %files vulkan-devel %changelog +* Wed Oct 06 2021 Dave Airlie - 21.1.8-2 +- add fix for leaking fd in device select + * Wed Sep 08 2021 Pete Walter - 21.1.8-1 - Update to 21.1.8