aboutsummaryrefslogtreecommitdiff
path: root/backend/drm
diff options
context:
space:
mode:
authoremersion <contact@emersion.fr>2018-01-30 19:45:57 +0100
committeremersion <contact@emersion.fr>2018-01-30 19:45:57 +0100
commitbabdd6ccf757f18ef15b50d9f16c55031a7c1944 (patch)
tree4e1d065ea0b710c44d362b07cc941cd290d5ac46 /backend/drm
parent704130cc1164604c5b805adf186999269e14c5a5 (diff)
backend: fix use-after-free when destroying backends
The backend destroy signal is emitted before the output_remove signal is. When the destroy signal is emitted listeners remove their output_remove listener, so the output_remove signal is never received and listeners have an invalid output pointer. The correct way to solve this would be to remove the output_remove signal completely and use the wlr_output.events.destroy signal instead. This isn't yet possible because wl_signal_emit is unsafe and listeners cannot be removed in listeners.
Diffstat (limited to 'backend/drm')
-rw-r--r--backend/drm/backend.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/backend/drm/backend.c b/backend/drm/backend.c
index de69dad5..dc6757a5 100644
--- a/backend/drm/backend.c
+++ b/backend/drm/backend.c
@@ -34,6 +34,8 @@ static void wlr_drm_backend_destroy(struct wlr_backend *backend) {
wlr_output_destroy(&conn->output);
}
+ wl_signal_emit(&backend->events.destroy, backend);
+
wl_list_remove(&drm->display_destroy.link);
wl_list_remove(&drm->session_signal.link);
wl_list_remove(&drm->drm_invalidated.link);