Changeset 87822ce in mainline for uspace/app

Timestamp:

2021-03-04T19:14:30Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d6c4d40

Parents:

760a392

Message:

Avoid infinite loop when console communication is broken

Need to make sure callers of console_get_event_timeout() can distinguish
between timeout and I/O error. Fix all callers of console_get_event()
and console_get_event_timeout() not to enter infinite loop when console
connection is broken. Also avoid setting of errno variable.

Location:

uspace/app

Files:

• bdsh/cmds/modules/cat/cat.c (modified) (1 diff)
• bdsh/cmds/modules/cp/cp.c (modified) (2 diffs)
• edit/edit.c (modified) (3 diffs)
• mkbd/main.c (modified) (1 diff)
• modplay/modplay.c (modified) (1 diff)
• netecho/netecho.c (modified) (2 diffs)
• nterm/nterm.c (modified) (1 diff)
• ping/ping.c (modified) (1 diff)
• tester/ipc/starve.c (modified) (1 diff)
• tetris/scores.c (modified) (2 diffs)
• tetris/screen.c (modified) (5 diffs)
• tetris/tetris.c (modified) (1 diff)
• top/screen.c (modified) (4 diffs)
• top/screen.h (modified) (2 diffs)
• top/top.c (modified) (3 diffs)
• trace/trace.c (modified) (2 diffs)

uspace/app/bdsh/cmds/modules/cat/cat.c

@@ -122 +122 @@
         cons_event_t ev;
         kbd_event_t *kev;
+        errno_t rc;
 
         while (true) {
-                if (!console_get_event(console, &ev)) {
+                rc = console_get_event(console, &ev);
+                if (rc != EOK)
                         return;
-                }
                 if (ev.type == CEV_KEY && ev.ev.key.type == KEY_PRESS) {
                         kev = &ev.ev.key;

uspace/app/bdsh/cmds/modules/cp/cp.c

@@ -146 +146 @@
 {
         va_list args;
+        errno_t rc;
 
         va_start(args, message);
@@ -154 +155 @@
                 cons_event_t ev;
                 console_flush(con);
-                console_get_event(con, &ev);
+                rc = console_get_event(con, &ev);
+                if (rc != EOK)
+                        exit(1);
                 if (ev.type != CEV_KEY || ev.ev.key.type != KEY_PRESS ||
                     (ev.ev.key.mods & (KM_CTRL | KM_ALT)) != 0) {

uspace/app/edit/edit.c

@@ -251 +251 @@
 
         while (!done) {
-                console_get_event(con, &ev);
+                rc = console_get_event(con, &ev);
+                if (rc != EOK)
+                        break;
+
                 pane.rflags = 0;
 
@@ -634 +637 @@
         int nc;
         bool done;
+        errno_t rc;
 
         asprintf(&str, "%s: %s", prompt, init_value);
@@ -648 +652 @@
 
         while (!done) {
-                console_get_event(con, &ev);
+                rc = console_get_event(con, &ev);
+                if (rc != EOK)
+                        return NULL;
 
                 if (ev.type == CEV_KEY && ev.ev.key.type == KEY_PRESS) {

uspace/app/mkbd/main.c

@@ -174 +174 @@
         while (true) {
                 cons_event_t ev;
-                bool ok = console_get_event(con, &ev);
-                if (!ok) {
+                errno_t rc = console_get_event(con, &ev);
+                if (rc != EOK) {
                         printf("Connection with console broken: %s.\n",
                             str_error(errno));

uspace/app/modplay/modplay.c

@@ -174 +174 @@
         while (true) {
                 timeout = 0;
-                if (console_get_event_timeout(con, &event, &timeout))
+                rc = console_get_event_timeout(con, &event, &timeout);
+                if (rc == EOK)
                         modplay_event(&event);
+                else if (rc != ETIMEOUT)
+                        break;
+
                 if (quit)
                         break;

uspace/app/netecho/netecho.c

@@ -121 +121 @@
 {
         cons_event_t ev;
+        errno_t rc;
 
         printf("Communication started. Press Ctrl-Q to quit.\n");
@@ -128 +129 @@
         done = false;
         while (!done) {
-                console_get_event(con, &ev);
+                rc = console_get_event(con, &ev);
+                if (rc != EOK)
+                        break;
+
                 if (ev.type == CEV_KEY && ev.ev.key.type == KEY_PRESS)
                         key_handle(&ev.ev.key);

uspace/app/nterm/nterm.c

@@ -130 +130 @@
         done = false;
         while (!done) {
-                console_get_event(con, &ev);
+                rc = console_get_event(con, &ev);
+                if (rc != EOK)
+                        break;
+
                 if (ev.type == CEV_KEY && ev.ev.key.type == KEY_PRESS)
                         key_handle(&ev.ev.key);

uspace/app/ping/ping.c

@@ -196 +196 @@
         while (true) {
                 cons_event_t ev;
-                if (!console_get_event(con, &ev))
-                        break;
+                errno_t rc;
+                rc = console_get_event(con, &ev);
+                if (rc != EOK) {
+                        ping_signal_received(RECEIVED_INTERRUPT);
+                        break;
+                }
 
                 if ((ev.type == CEV_KEY) && (ev.ev.key.type == KEY_PRESS) &&

uspace/app/tester/ipc/starve.c

@@ -57 +57 @@
                 cons_event_t ev;
                 usec_t timeout = 0;
-                bool has_event = console_get_event_timeout(console, &ev, &timeout);
-                if (has_event && ev.type == CEV_KEY && ev.ev.key.type == KEY_PRESS) {
-                        TPRINTF("Key %d pressed, terminating.\n", ev.ev.key.key);
+                errno_t rc = console_get_event_timeout(console, &ev, &timeout);
+                if (rc == EOK) {
+                        if (ev.type == CEV_KEY && ev.ev.key.type == KEY_PRESS) {
+                                TPRINTF("Key %d pressed, terminating.\n", ev.ev.key.key);
+                                break;
+                        }
+                } else if (rc != ETIMEOUT) {
+                        TPRINTF("Got rc=%d, terminating.\n", rc);
                         break;
                 }

uspace/app/tetris/scores.c

@@ -126 +126 @@
         cons_event_t ev;
         kbd_event_t *kev;
+        errno_t rc;
 
         clear_screen();
@@ -141 +142 @@
         while (true) {
                 console_flush(console);
-                if (!console_get_event(console, &ev))
+                rc = console_get_event(console, &ev);
+                if (rc != EOK)
                         exit(1);
 

uspace/app/tetris/screen.c

@@ -54 +54 @@
  */
 
+#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -340 +341 @@
 {
         usec_t timeout = fallrate;
+        errno_t rc;
 
         while (timeout > 0) {
                 cons_event_t event;
 
-                if (!console_get_event_timeout(console, &event, &timeout))
+                rc = console_get_event_timeout(console, &event, &timeout);
+                if (rc == ETIMEOUT)
                         break;
+                if (rc != EOK)
+                        exit(1);
         }
 }
@@ -354 +359 @@
 int tgetchar(void)
 {
+        errno_t rc;
+
         /*
          * Reset timeleft to fallrate whenever it is not positive
@@ -376 +383 @@
                 cons_event_t event;
 
-                if (!console_get_event_timeout(console, &event, &timeleft)) {
+                rc = console_get_event_timeout(console, &event, &timeleft);
+                if (rc == ETIMEOUT) {
                         timeleft = 0;
                         return -1;
                 }
+                if (rc != EOK)
+                        exit(1);
 
                 if (event.type == CEV_KEY && event.ev.key.type == KEY_PRESS)
@@ -394 +404 @@
 {
         char32_t c = 0;
+        errno_t rc;
 
         while (c == 0) {
                 cons_event_t event;
 
-                if (!console_get_event(console, &event))
+                rc = console_get_event(console, &event);
+                if (rc == ETIMEOUT)
                         return -1;
+                if (rc != EOK)
+                        exit(1);
 
                 if (event.type == CEV_KEY && event.ev.key.type == KEY_PRESS)

uspace/app/tetris/tetris.c

@@ -202 +202 @@
         while (true) {
                 int i = getchar();
+                if (i < 0)
+                        return 0;
 
                 switch (i) {

uspace/app/top/screen.c

@@ -534 +534 @@
 /** Get char with timeout
  *
+ * @param sec Timeout in seconds
+ * @param rch Place to store character on success
+ * @return EOK on success, ETIMEOUT on time out, EIO on other error
  */
-int tgetchar(sec_t sec)
-{
+errno_t tgetchar(sec_t sec, int *rch)
+{
+        errno_t rc;
+
         /*
          * Reset timeleft whenever it is not positive.
@@ -548 +553 @@
          * update timeleft so that the next call to tgetchar()
          * will not wait as long. If there is no input,
-         * make timeleft zero and return -1.
+         * make timeleft zero and return ETIMEOUT.
          */
 
@@ -557 +562 @@
 
                 warning_timeleft -= timeleft;
-                if (!console_get_event_timeout(console, &event, &timeleft)) {
+                rc = console_get_event_timeout(console, &event, &timeleft);
+                if (rc == ETIMEOUT) {
                         timeleft = 0;
-                        return -1;
-                }
+                        return ETIMEOUT;
+                }
+
+                if (rc != EOK)
+                        return EIO;
+
                 warning_timeleft += timeleft;
 
@@ -567 +577 @@
         }
 
-        return (int) c;
+        *rch = (int) c;
+        return EOK;
 }
 

uspace/app/top/screen.h

@@ -35 +35 @@
 #define TOP_SCREEN_H_
 
+#include <errno.h>
 #include <io/console.h>
 #include <io/verify.h>
@@ -47 +48 @@
     _HELENOS_PRINTF_ATTRIBUTE(1, 2);
 
-extern int tgetchar(sec_t);
+extern errno_t tgetchar(sec_t, int *);
 
 #endif

uspace/app/top/top.c

@@ -583 +583 @@
         data_t data_prev;
         const char *ret = NULL;
+        errno_t rc;
+        int c;
 
         screen_init();
@@ -595 +597 @@
         /* And paint screen until death */
         while (true) {
-                int c = tgetchar(UPDATE_INTERVAL);
-
-                if (c < 0) { /* timeout */
+                rc = tgetchar(UPDATE_INTERVAL, &c);
+
+                if (rc == ETIMEOUT) { /* timeout */
                         data_prev = data;
                         if ((ret = read_data(&data)) != NULL) {
@@ -608 +610 @@
 
                         c = -1;
+                } else if (rc != EOK) {
+                        /* Error (e.g. communication with console lost) */
+                        goto out;
                 }
 

uspace/app/trace/trace.c

@@ -511 +511 @@
 {
         cons_event_t event;
+        errno_t rc;
 
         (void) arg;
@@ -522 +523 @@
                 fibril_mutex_unlock(&state_lock);
 
-                if (!console_get_event(console, &event))
+                rc = console_get_event(console, &event);
+                if (rc != EOK)
                         return EINVAL;