udev: add upper bound of 5 hours to SYSTEMD_UDEV_EXTRA_TIMEOUT_SEC=

Follow-up for b16c6076cb CID#1533111
2024-01-04 14:30:20 +01:00
parent 43108bf87a
commit 5af0f171f9
2 changed files with 9 additions and 2 deletions
@@ -335,6 +335,7 @@ static int on_event_timeout_warning(sd_event_source *s, uint64_t usec, void *use
 static usec_t extra_timeout_usec(void) {
        static usec_t saved = 10 * USEC_PER_SEC;
        static bool parsed = false;
+        usec_t timeout;
        const char *e;
        int r;

@@ -347,10 +348,15 @@ static usec_t extra_timeout_usec(void) {
        if (!e)
                return saved;

-        r = parse_sec(e, &saved);
+        r = parse_sec(e, &timeout);
        if (r < 0)
                log_debug_errno(r, "Failed to parse $SYSTEMD_UDEV_EXTRA_TIMEOUT_SEC=%s, ignoring: %m", e);

+        if (timeout > 5 * USEC_PER_HOUR) /* Add an arbitrary upper bound */
+                log_debug("Parsed $SYSTEMD_UDEV_EXTRA_TIMEOUT_SEC=%s is too large, ignoring.", e);
+        else
+                saved = timeout;
+
        return saved;
 }