DispVM restore: do not spin forever when QubesDB connection is closed

This is already quite fatal situation, but do not make it even worse by spinning in endless loop. QubesOS/qubes-issues#1389
marmarek · Nov 7, 2015 · e2da2b8 · e2da2b8
1 parent eae2203
commit e2da2b8
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/gui-common/txrx-vchan.c b/gui-common/txrx-vchan.c
@@ -149,8 +149,16 @@ void wait_for_possible_dispvm_resume() {
     }
     do {
         tmp = qdb_read_watch(qdb);
-        if (tmp)
+        if (tmp) {
             free(tmp);
+        } else if (errno == EPIPE) {
+            /* QubesDB connection closed (crashed?), assume DispVM was
+             * restored, as it is safer option than aborting the whole
+             * gui-agent
+             */
+            break;
+        }
+
     }
     while (!tmp); // wait for dom0 to create qubesdb entry
 out: