From 4519db23ef716f37f804485f50955c26c38a6ae6 Mon Sep 17 00:00:00 2001 From: Mariusz Ceier Date: Sun, 29 Jul 2018 10:20:14 +0200 Subject: [PATCH] xf86drm: Fix error path in drmGetDevice2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In drmGetDevice2 when no local device is found or when drm_device_has_rdev filters out all devices, *device might be left uninitialized causing drmGetDevice2 to not return error - since it's only returned when *device == NULL. Above leads to crash in the firefox in system with amdgpu. With this change firefox displays: libGL error: MESA-LOADER: failed to retrieve device information libGL error: unable to load driver: amdgpu_dri.so libGL error: driver pointer missing libGL error: failed to load driver: amdgpu libGL error: MESA-LOADER: failed to retrieve device information libGL error: unable to load driver: amdgpu_dri.so libGL error: driver pointer missing libGL error: failed to load driver: amdgpu and doesn't crash. Bugzilla: https://bugs.freedesktop.org/107384 Reviewed-by: Michel Dänzer Signed-off-by: Mariusz Ceier --- xf86drm.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xf86drm.c b/xf86drm.c index 1e621e99..336d64de 100644 --- a/xf86drm.c +++ b/xf86drm.c @@ -3935,6 +3935,8 @@ int drmGetDevice2(int fd, uint32_t flags, drmDevicePtr *device) drmFoldDuplicatedDevices(local_devices, node_count); + *device = NULL; + for (i = 0; i < node_count; i++) { if (!local_devices[i]) continue;