From ffa86d84a5546c5a20f463b8eb3276c88415f885 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= <daniel@ekloef.se>
Date: Fri, 17 Dec 2021 11:40:12 +0100
Subject: [PATCH] module/removables: handle poll() failures

---
 modules/removables.c | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/modules/removables.c b/modules/removables.c
index 3a54379..736317f 100644
--- a/modules/removables.c
+++ b/modules/removables.c
@@ -5,6 +5,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <assert.h>
+#include <errno.h>
 
 #include <poll.h>
 #include <sys/stat.h>
@@ -547,16 +548,26 @@ run(struct module *mod)
      * mount/unmount operations */
     int mount_info_fd = open("/proc/self/mountinfo", O_RDONLY);
 
+    int ret = 1;
+
     while (true) {
         struct pollfd fds[] = {
             {.fd = mod->abort_fd, .events = POLLIN},
             {.fd = udev_monitor_get_fd(dev_mon), .events = POLLIN},
             {.fd = mount_info_fd, .events = POLLPRI},
         };
-        poll(fds, 3, -1);
+        if (poll(fds, sizeof(fds) / sizeof(fds[0]), -1) < 0) {
+            if (errno == EINTR)
+                continue;
 
-        if (fds[0].revents & POLLIN)
+            LOG_ERRNO("failed to poll");
             break;
+        }
+
+        if (fds[0].revents & POLLIN) {
+            ret = 0;
+            break;
+        }
 
         bool update = false;
 
@@ -587,7 +598,7 @@ run(struct module *mod)
 
     udev_monitor_unref(dev_mon);
     udev_unref(udev);
-    return 0;
+    return ret;
 }
 
 static struct module *