Changeset a0d4afe in mainline

Timestamp:

2023-01-18T16:51:44Z (2 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

3e7e226

Parents:

b0ae23f

Message:

Make sure input device configuration is destroyed together with seat

When a seat is destroyed without unassigning devices first, this causes
a dangling seat pointer that would cause the display server to crash
if the corresponding device generates an event.

Location:

uspace/srv/hid/display

Files:

• display.c (modified) (4 diffs)
• idevcfg.c (modified) (3 diffs)
• seat.c (modified) (4 diffs)
• seat.h (modified) (1 diff)
• types/display/idevcfg.h (modified) (1 diff)
• types/display/seat.h (modified) (1 diff)

uspace/srv/hid/display/display.c

@@ -796 +796 @@
 {
         assert(idevcfg->display == NULL);
-        assert(!link_used(&idevcfg->lidevcfgs));
+        assert(!link_used(&idevcfg->ldispidcfgs));
 
         idevcfg->display = disp;
-        list_append(&idevcfg->lidevcfgs, &disp->idevcfgs);
+        list_append(&idevcfg->ldispidcfgs, &disp->idevcfgs);
 }
 
@@ -808 +808 @@
 void ds_display_remove_idevcfg(ds_idevcfg_t *idevcfg)
 {
-        list_remove(&idevcfg->lidevcfgs);
+        list_remove(&idevcfg->ldispidcfgs);
         idevcfg->display = NULL;
 }
@@ -824 +824 @@
                 return NULL;
 
-        return list_get_instance(link, ds_idevcfg_t, lidevcfgs);
+        return list_get_instance(link, ds_idevcfg_t, ldispidcfgs);
 }
 
@@ -834 +834 @@
 ds_idevcfg_t *ds_display_next_idevcfg(ds_idevcfg_t *idevcfg)
 {
-        link_t *link = list_next(&idevcfg->lidevcfgs, &idevcfg->display->idevcfgs);
-
-        if (link == NULL)
-                return NULL;
-
-        return list_get_instance(link, ds_idevcfg_t, lidevcfgs);
+        link_t *link = list_next(&idevcfg->ldispidcfgs, &idevcfg->display->idevcfgs);
+
+        if (link == NULL)
+                return NULL;
+
+        return list_get_instance(link, ds_idevcfg_t, ldispidcfgs);
 }
 

uspace/srv/hid/display/idevcfg.c

@@ -41 +41 @@
 #include "display.h"
 #include "idevcfg.h"
+#include "seat.h"
 
 /** Create input device configuration entry.
@@ -61 +62 @@
 
         idevcfg->svc_id = svc_id;
-        idevcfg->seat = seat;
+        ds_seat_add_idevcfg(seat, idevcfg);
 
         ds_display_add_idevcfg(display, idevcfg);
@@ -75 +76 @@
 {
         ds_display_remove_idevcfg(idevcfg);
+        ds_seat_remove_idevcfg(idevcfg);
         free(idevcfg);
 }

uspace/srv/hid/display/seat.c

@@ -43 +43 @@
 #include "cursor.h"
 #include "display.h"
+#include "idevcfg.h"
 #include "seat.h"
 #include "window.h"
@@ -79 +80 @@
         }
 
+        list_initialize(&seat->idevcfgs);
+
         ds_display_add_seat(display, seat);
         seat->pntpos.x = 0;
@@ -96 +99 @@
 void ds_seat_destroy(ds_seat_t *seat)
 {
+        ds_idevcfg_t *idevcfg;
+
+        /* Remove all input device configuration entries pointing to this seat */
+        idevcfg = ds_seat_first_idevcfg(seat);
+        while (idevcfg != NULL) {
+                ds_idevcfg_destroy(idevcfg);
+                idevcfg = ds_seat_first_idevcfg(seat);
+        }
+
         ds_display_remove_seat(seat);
+
         free(seat->name);
         free(seat);
@@ -549 +562 @@
 }
 
+/** Add input device configuration entry to seat.
+ *
+ * @param seat Seat
+ * @param idevcfg Input device configuration
+ */
+void ds_seat_add_idevcfg(ds_seat_t *seat, ds_idevcfg_t *idevcfg)
+{
+        assert(idevcfg->seat == NULL);
+        assert(!link_used(&idevcfg->lseatidcfgs));
+
+        idevcfg->seat = seat;
+        list_append(&idevcfg->lseatidcfgs, &seat->idevcfgs);
+}
+
+/** Remove input device configuration entry from seat.
+ *
+ * @param idevcfg Input device configuration entry
+ */
+void ds_seat_remove_idevcfg(ds_idevcfg_t *idevcfg)
+{
+        list_remove(&idevcfg->lseatidcfgs);
+        idevcfg->seat = NULL;
+}
+
+/** Get first input device configuration entry in seat.
+ *
+ * @param disp Display
+ * @return First input device configuration entry or @c NULL if there is none
+ */
+ds_idevcfg_t *ds_seat_first_idevcfg(ds_seat_t *seat)
+{
+        link_t *link = list_first(&seat->idevcfgs);
+
+        if (link == NULL)
+                return NULL;
+
+        return list_get_instance(link, ds_idevcfg_t, lseatidcfgs);
+}
+
+/** Get next input device configuration entry in seat.
+ *
+ * @param idevcfg Current input device configuration entry
+ * @return Next input device configuration entry or @c NULL if there is none
+ */
+ds_idevcfg_t *ds_seat_next_idevcfg(ds_idevcfg_t *idevcfg)
+{
+        link_t *link = list_next(&idevcfg->lseatidcfgs, &idevcfg->seat->idevcfgs);
+
+        if (link == NULL)
+                return NULL;
+
+        return list_get_instance(link, ds_idevcfg_t, lseatidcfgs);
+}
+
 /** @}
  */

uspace/srv/hid/display/seat.h

@@ -58 +58 @@
 extern void ds_seat_set_wm_cursor(ds_seat_t *, ds_cursor_t *);
 extern errno_t ds_seat_paint_pointer(ds_seat_t *, gfx_rect_t *);
+extern void ds_seat_add_idevcfg(ds_seat_t *, ds_idevcfg_t *);
+extern void ds_seat_remove_idevcfg(ds_idevcfg_t *);
+extern ds_idevcfg_t *ds_seat_first_idevcfg(ds_seat_t *);
+extern ds_idevcfg_t *ds_seat_next_idevcfg(ds_idevcfg_t *);
 
 #endif

uspace/srv/hid/display/types/display/idevcfg.h

@@ -45 +45 @@
         struct ds_display *display;
         /** Link to display->idevcfgs */
-        link_t lidevcfgs;
+        link_t ldispidcfgs;
+        /** Link to seat->idevcfgs */
+        link_t lseatidcfgs;
         /** Service ID */
         service_id_t svc_id;

uspace/srv/hid/display/types/display/seat.h

@@ -52 +52 @@
         /** Seat name */
         char *name;
+        /** Input device configurations mapping to this seat */
+        list_t idevcfgs;
         /** Window this seat is focused on */
         struct ds_window *focus;