diff options
| author | Chris Coulson <chris.coulson@canonical.com> | 2018-07-19 18:26:05 +0100 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2018-08-13 10:35:09 -0400 |
| commit | 1ac1697b3b019f50729a6e992065959586e170da (patch) | |
| tree | 150e148d1533564df003c9644e51ad8974977a62 /daemon/gdm-manager.c | |
| parent | 0e92e2c93a65544892d65c3f5950a2d5f8dc7f46 (diff) | |
| download | gdm-1ac1697b3b019f50729a6e992065959586e170da.tar.gz | |
display-store: Pass the display object rather than the id in the removed signal
By the time GdmDisplayStore emits the "display-removed" signal, the display
is no longer in the store and gdm_display_store_lookup will not work in
signal handlers.
Change the "display-removed" parameter from the display id to the GdmDisplay
object, so that signal handers can perform any cleanup they need to do
CVE-2018-14424
Closes: https://gitlab.gnome.org/GNOME/gdm/issues/401
Diffstat (limited to 'daemon/gdm-manager.c')
| -rw-r--r-- | daemon/gdm-manager.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/daemon/gdm-manager.c b/daemon/gdm-manager.c index f17bd1a5..f6684a8b 100644 --- a/daemon/gdm-manager.c +++ b/daemon/gdm-manager.c @@ -1541,19 +1541,18 @@ on_display_status_changed (GdmDisplay *display, static void on_display_removed (GdmDisplayStore *display_store, - const char *id, + GdmDisplay *display, GdmManager *manager) { - GdmDisplay *display; + char *id; - display = gdm_display_store_lookup (display_store, id); - if (display != NULL) { - g_dbus_object_manager_server_unexport (manager->priv->object_manager, id); + gdm_display_get_id (display, &id, NULL); + g_dbus_object_manager_server_unexport (manager->priv->object_manager, id); + g_free (id); - g_signal_handlers_disconnect_by_func (display, G_CALLBACK (on_display_status_changed), manager); + g_signal_handlers_disconnect_by_func (display, G_CALLBACK (on_display_status_changed), manager); - g_signal_emit (manager, signals[DISPLAY_REMOVED], 0, id); - } + g_signal_emit (manager, signals[DISPLAY_REMOVED], 0, display); } static void @@ -2535,9 +2534,9 @@ gdm_manager_class_init (GdmManagerClass *klass) G_STRUCT_OFFSET (GdmManagerClass, display_removed), NULL, NULL, - g_cclosure_marshal_VOID__STRING, + g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, - 1, G_TYPE_STRING); + 1, G_TYPE_OBJECT); g_object_class_install_property (object_class, PROP_XDMCP_ENABLED, |