Changeset 6fc4a32 in mainline

Timestamp:

2018-10-29T17:15:02Z (5 years ago)

Author:

Jakub Jermar <jakub@…>

Children:

f230cbd

Parents:

eec201d

git-author:

Jakub Jermar <jakub@…> (2018-10-28 14:28:41)

git-committer:

Jakub Jermar <jakub@…> (2018-10-29 17:15:02)

Message:

Do not leave connected phones behind

The connection structure is deallocated when client_connection returns.
We must therefore not leave any connected phones behind or else any
incoming call (e.g. IPC_M_PHONE_HUNGUP) will attempt to use the
deallocated connection structure since its address is still stored as a
label in the phone and copied to the call.

File:

• uspace/srv/hid/compositor/compositor.c (modified) (4 diffs)

uspace/srv/hid/compositor/compositor.c

@@ -926 +926 @@
                         window_t *win = window_create();
                         if (!win) {
-                                async_answer_2(&call, ENOMEM, 0, 0);
+                                async_answer_0(&call, EHANGUP);
                                 fibril_mutex_unlock(&window_list_mtx);
                                 return;
@@ -945 +945 @@
                         if (loc_service_register(name_in, &win->in_dsid) != EOK) {
                                 window_destroy(win);
-                                async_answer_2(&call, EINVAL, 0, 0);
+                                async_answer_0(&call, EHANGUP);
                                 fibril_mutex_unlock(&window_list_mtx);
                                 return;
@@ -953 +953 @@
                                 loc_service_unregister(win->in_dsid);
                                 window_destroy(win);
-                                async_answer_2(&call, EINVAL, 0, 0);
+                                async_answer_0(&call, EHANGUP);
                                 fibril_mutex_unlock(&window_list_mtx);
                                 return;
@@ -974 +974 @@
                         }
 
-                        return;
-                } else {
-                        async_answer_0(&call, EINVAL);
-                        return;
-                }
+                        async_get_call(&call);
+                }
+                async_answer_0(&call, EHANGUP);
+                return;
         }