44 lines
2.0 KiB
Diff
44 lines
2.0 KiB
Diff
From 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 | 16 +++++++++++-----
|
|
1 file changed, 11 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/src/udev/udevd.c b/src/udev/udevd.c
|
|
index cd517931d3..95c6468029 100644
|
|
--- a/src/udev/udevd.c
|
|
+++ b/src/udev/udevd.c
|
|
@@ -1048,17 +1048,23 @@ static int parse_argv(int argc, char *argv[]) {
|
|
arg_daemonize = true;
|
|
break;
|
|
case 'c':
|
|
- safe_atoi(optarg, &arg_children_max);
|
|
+ r = safe_atoi(optarg, &arg_children_max);
|
|
+ if (r < 0)
|
|
+ log_warning("Invalid --children-max ignored: %s", optarg);
|
|
break;
|
|
case 'e':
|
|
- safe_atoi(optarg, &arg_exec_delay);
|
|
+ r = safe_atoi(optarg, &arg_exec_delay);
|
|
+ if (r < 0)
|
|
+ log_warning("Invalid --exec-delay ignored: %s", optarg);
|
|
break;
|
|
case 't':
|
|
r = safe_atou64(optarg, &arg_event_timeout_usec);
|
|
if (r < 0)
|
|
- break;
|
|
- arg_event_timeout_usec *= USEC_PER_SEC;
|
|
- arg_event_timeout_warn_usec = (arg_event_timeout_usec / 3) ? : 1;
|
|
+ log_warning("Invalig --event-timeout ignored: %s", optarg);
|
|
+ else {
|
|
+ arg_event_timeout_usec *= USEC_PER_SEC;
|
|
+ arg_event_timeout_warn_usec = (arg_event_timeout_usec / 3) ? : 1;
|
|
+ }
|
|
break;
|
|
case 'D':
|
|
arg_debug = true;
|