iov_iter: Define flags to qualify page extraction.

[platform/kernel/linux-rpi.git] / lib / parser.c

diff --git a/lib/parser.c b/lib/parser.c
index bcb2348..2b5e2b4 100644 (file)
--- a/lib/parser.c
+++ b/lib/parser.c
@@ -11,6 +11,15 @@
 #include <linux/slab.h>
 #include <linux/string.h>
 
+/*
+ * max size needed by different bases to express U64
+ * HEX: "0xFFFFFFFFFFFFFFFF" --> 18
+ * DEC: "18446744073709551615" --> 20
+ * OCT: "01777777777777777777777" --> 23
+ * pick the max one to define NUMBER_BUF_LEN
+ */
+#define NUMBER_BUF_LEN 24
+
 /**
  * match_one - Determines if a string matches a simple pattern
  * @s: the string to examine for presence of the pattern
@@ -129,14 +138,12 @@ EXPORT_SYMBOL(match_token);
 static int match_number(substring_t *s, int *result, int base)
 {
        char *endp;
-       char *buf;
+       char buf[NUMBER_BUF_LEN];
        int ret;
        long val;
 
-       buf = match_strdup(s);
-       if (!buf)
-               return -ENOMEM;
-
+       if (match_strlcpy(buf, s, NUMBER_BUF_LEN) >= NUMBER_BUF_LEN)
+               return -ERANGE;
        ret = 0;
        val = simple_strtol(buf, &endp, base);
        if (endp == buf)
@@ -145,7 +152,6 @@ static int match_number(substring_t *s, int *result, int base)
                ret = -ERANGE;
        else
                *result = (int) val;
-       kfree(buf);
        return ret;
 }
 
@@ -163,18 +169,15 @@ static int match_number(substring_t *s, int *result, int base)
  */
 static int match_u64int(substring_t *s, u64 *result, int base)
 {
-       char *buf;
+       char buf[NUMBER_BUF_LEN];
        int ret;
        u64 val;
 
-       buf = match_strdup(s);
-       if (!buf)
-               return -ENOMEM;
-
+       if (match_strlcpy(buf, s, NUMBER_BUF_LEN) >= NUMBER_BUF_LEN)
+               return -ERANGE;
        ret = kstrtoull(buf, base, &val);
        if (!ret)
                *result = val;
-       kfree(buf);
        return ret;
 }
 
@@ -206,14 +209,12 @@ EXPORT_SYMBOL(match_int);
  */
 int match_uint(substring_t *s, unsigned int *result)
 {
-       int err = -ENOMEM;
-       char *buf = match_strdup(s);
+       char buf[NUMBER_BUF_LEN];
 
-       if (buf) {
-               err = kstrtouint(buf, 10, result);
-               kfree(buf);
-       }
-       return err;
+       if (match_strlcpy(buf, s, NUMBER_BUF_LEN) >= NUMBER_BUF_LEN)
+               return -ERANGE;
+
+       return kstrtouint(buf, 10, result);
 }
 EXPORT_SYMBOL(match_uint);