systemd/1080-udevd-parse_argv-warn-if-argumens-are-invalid.patch

Based on 6f5cf8a8b1de763383f7382821147e538b7dbd6d Mon Sep 17 00:00:00 2001
From: Tom Gundersen <teg@jklm.no>
Date: Thu, 18 Sep 2014 19:02:03 +0200
Subject: [PATCH] udevd: parse_argv - warn if argumens are invalid

Found by Coverity. Fixes CID #1238780.
---
 src/udev/udevd.c |   34 ++++++++++++++++++++++++++--------
 1 file changed, 26 insertions(+), 8 deletions(-)

--- src/udev/udevd.c
+++ src/udev/udevd.c	2014-09-19 10:36:25.602735652 +0000
@@ -1002,11 +1002,20 @@ static void kernel_cmdline_options(struc
                         log_set_max_level(prio);
                         udev_set_log_priority(udev, prio);
                 } else if (startswith(opt, "udev.children-max=")) {
-                        children_max = strtoul(opt + 18, NULL, 0);
+                        r = safe_atoi(opt + 18, &children_max);
+                        if (r < 0)
+                                log_warning("Invalid udev.children-max ignored: %s", opt + 18);
                 } else if (startswith(opt, "udev.exec-delay=")) {
-                        exec_delay = strtoul(opt + 16, NULL, 0);
+                        r = safe_atoi(opt + 16, &exec_delay);
+                        if (r < 0)
+                                log_warning("Invalid udev.exec-delay ignored: %s", opt + 16);
                 } else if (startswith(opt, "udev.event-timeout=")) {
-                        event_timeout_usec = strtoul(opt + 16, NULL, 0) * USEC_PER_SEC;
+                        r = safe_atou64(opt + 16, &event_timeout_usec);
+                        if (r < 0) {
+                                log_warning("Invalid udev.event-timeout ignored: %s", opt + 16);
+                                break;
+                        }
+                        event_timeout_usec *= USEC_PER_SEC;
                         event_timeout_warn_usec = (event_timeout_usec / 3) ? : 1;
                 }
 
@@ -1052,7 +1061,7 @@ int main(int argc, char *argv[]) {
         label_init("/dev");
 
         for (;;) {
-                int option;
+                int option, r;
 
                 option = getopt_long(argc, argv, "c:de:DtN:hV", options, NULL);
                 if (option == -1)
@@ -1063,14 +1072,23 @@ int main(int argc, char *argv[]) {
                         daemonize = true;
                         break;
                 case 'c':
-                        children_max = strtoul(optarg, NULL, 0);
+                        r = safe_atoi(optarg, &children_max);
+                        if (r < 0)
+                                log_warning("Invalid --children-max ignored: %s", optarg);
                         break;
                 case 'e':
-                        exec_delay = strtoul(optarg, NULL, 0);
+                        r = safe_atoi(optarg, &exec_delay);
+                        if (r < 0)
+                                log_warning("Invalid --exec-delay ignored: %s", optarg);
                         break;
                 case 't':
-                        event_timeout_usec = strtoul(optarg, NULL, 0) * USEC_PER_SEC;
-                        event_timeout_warn_usec = (event_timeout_usec / 3) ? : 1;
+                        r = safe_atou64(optarg, &event_timeout_usec);
+                        if (r < 0)
+                                log_warning("Invalig --event-timeout ignored: %s", optarg);
+                        else {
+                                event_timeout_usec *= USEC_PER_SEC;
+                                event_timeout_warn_usec = (event_timeout_usec / 3) ? : 1;
+                        }
                         break;
                 case 'D':
                         debug = true;