60 lines
1.8 KiB
Diff
60 lines
1.8 KiB
Diff
|
From 147a3696b45a872e0e21fb74e1497f02543ce871 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Lennart Poettering <lennart@poettering.net>
|
||
|
|
Date: Mon, 1 Jun 2020 17:16:04 +0200
|
||
|
|
Subject: [PATCH] parse-util: rewrite parse_mode() on top of safe_atou_full()
|
||
|
|
|
||
|
|
Parsing is hard, hence let's use our own careful wrappers wherever
|
||
|
|
possible.
|
||
|
|
|
||
|
|
(cherry picked from commit c44702a8bd8cc8b7f2f1df21db9308d9af7dda5b)
|
||
|
|
|
||
|
|
Related: #1848373
|
||
|
|
---
|
||
|
|
src/basic/parse-util.c | 28 +++++++++++++---------------
|
||
|
|
1 file changed, 13 insertions(+), 15 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c
|
||
|
|
index 7a7cefe6ff..68c156c543 100644
|
||
|
|
--- a/src/basic/parse-util.c
|
||
|
|
+++ b/src/basic/parse-util.c
|
||
|
|
@@ -54,26 +54,24 @@ int parse_pid(const char *s, pid_t* ret_pid) {
|
||
|
|
}
|
||
|
|
|
||
|
|
int parse_mode(const char *s, mode_t *ret) {
|
||
|
|
- char *x;
|
||
|
|
- long l;
|
||
|
|
+ unsigned m;
|
||
|
|
+ int r;
|
||
|
|
|
||
|
|
assert(s);
|
||
|
|
- assert(ret);
|
||
|
|
|
||
|
|
- s += strspn(s, WHITESPACE);
|
||
|
|
- if (s[0] == '-')
|
||
|
|
- return -ERANGE;
|
||
|
|
-
|
||
|
|
- errno = 0;
|
||
|
|
- l = strtol(s, &x, 8);
|
||
|
|
- if (errno > 0)
|
||
|
|
- return -errno;
|
||
|
|
- if (!x || x == s || *x != 0)
|
||
|
|
- return -EINVAL;
|
||
|
|
- if (l < 0 || l > 07777)
|
||
|
|
+ r = safe_atou_full(s, 8 |
|
||
|
|
+ SAFE_ATO_REFUSE_PLUS_MINUS, /* Leading '+' or even '-' char? that's just weird,
|
||
|
|
+ * refuse. User might have wanted to add mode flags or
|
||
|
|
+ * so, but this parser doesn't allow that, so let's
|
||
|
|
+ * better be safe. */
|
||
|
|
+ &m);
|
||
|
|
+ if (r < 0)
|
||
|
|
+ return r;
|
||
|
|
+ if (m > 07777)
|
||
|
|
return -ERANGE;
|
||
|
|
|
||
|
|
- *ret = (mode_t) l;
|
||
|
|
+ if (ret)
|
||
|
|
+ *ret = m;
|
||
|
|
return 0;
|
||
|
|
}
|
||
|
|
|