diff options
Diffstat (limited to 'lib')
-rw-r--r-- | lib/parser.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/parser.c b/lib/parser.c index c43410084838..52cfa69f73df 100644 --- a/lib/parser.c +++ b/lib/parser.c | |||
@@ -122,13 +122,14 @@ int match_token(char *s, const match_table_t table, substring_t args[]) | |||
122 | * | 122 | * |
123 | * Description: Given a &substring_t and a base, attempts to parse the substring | 123 | * Description: Given a &substring_t and a base, attempts to parse the substring |
124 | * as a number in that base. On success, sets @result to the integer represented | 124 | * as a number in that base. On success, sets @result to the integer represented |
125 | * by the string and returns 0. Returns either -ENOMEM or -EINVAL on failure. | 125 | * by the string and returns 0. Returns -ENOMEM, -EINVAL, or -ERANGE on failure. |
126 | */ | 126 | */ |
127 | static int match_number(substring_t *s, int *result, int base) | 127 | static int match_number(substring_t *s, int *result, int base) |
128 | { | 128 | { |
129 | char *endp; | 129 | char *endp; |
130 | char *buf; | 130 | char *buf; |
131 | int ret; | 131 | int ret; |
132 | long val; | ||
132 | size_t len = s->to - s->from; | 133 | size_t len = s->to - s->from; |
133 | 134 | ||
134 | buf = kmalloc(len + 1, GFP_KERNEL); | 135 | buf = kmalloc(len + 1, GFP_KERNEL); |
@@ -136,10 +137,15 @@ static int match_number(substring_t *s, int *result, int base) | |||
136 | return -ENOMEM; | 137 | return -ENOMEM; |
137 | memcpy(buf, s->from, len); | 138 | memcpy(buf, s->from, len); |
138 | buf[len] = '\0'; | 139 | buf[len] = '\0'; |
139 | *result = simple_strtol(buf, &endp, base); | 140 | |
140 | ret = 0; | 141 | ret = 0; |
142 | val = simple_strtol(buf, &endp, base); | ||
141 | if (endp == buf) | 143 | if (endp == buf) |
142 | ret = -EINVAL; | 144 | ret = -EINVAL; |
145 | else if (val < (long)INT_MIN || val > (long)INT_MAX) | ||
146 | ret = -ERANGE; | ||
147 | else | ||
148 | *result = (int) val; | ||
143 | kfree(buf); | 149 | kfree(buf); |
144 | return ret; | 150 | return ret; |
145 | } | 151 | } |