hyprwm/wlroots-hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/wlroots-hyprland.git synced 2024-11-22 12:55:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

drm-lease-v1: skip device on wlr_drm_backend_get_non_master_fd failure

Browse source 
On some setups, wlr_drm_backend_get_non_master_fd may fail because
of permission issues. Instead of exposing a bogus global, bail out.

Closes: https://gitlab.freedesktop.org/wlroots/wlroots/-/issues/3391
This commit is contained in:
Simon Ser 2022-03-29 16:14:38 +02:00 committed by Simon Zeni
parent 95d3529edf
commit 410c08cdc6
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
types/wlr_drm_lease_v1.c
View file

@ -621,10 +621,18 @@ static void handle_backend_destroy(struct wl_listener *listener, void *data) {
static void drm_lease_device_v1_create(struct wlr_drm_lease_v1_manager *manager, static void drm_lease_device_v1_create(struct wlr_drm_lease_v1_manager *manager,
struct wlr_backend *backend) { struct wlr_backend *backend) {
assert(backend); struct wlr_drm_backend *drm_backend = get_drm_backend_from_backend(backend);
// Make sure we can get a non-master FD for the DRM backend. On some setups
// we don't have the permission for this.
int fd = wlr_drm_backend_get_non_master_fd(backend);
if (fd < 0) {
wlr_log(WLR_INFO, "Skipping %s: failed to get read-only DRM FD",
drm_backend->name);
return;
}
close(fd);
struct wlr_drm_backend *drm_backend =
get_drm_backend_from_backend(backend);
wlr_log(WLR_DEBUG, "Creating wlr_drm_lease_device_v1 for %s", wlr_log(WLR_DEBUG, "Creating wlr_drm_lease_device_v1 for %s",
drm_backend->name); drm_backend->name);