On Thu, 8 May 2014 19:00:43 +0200 Fabian Frederick <[email protected]> wrote:
> ...
>
> --- a/kernel/res_counter.c
> +++ b/kernel/res_counter.c
> @@ -186,8 +186,8 @@ int res_counter_memparse_write_strategy(const char *buf,
>
> /* return RES_COUNTER_MAX(unlimited) if "-1" is specified */
> if (*buf == '-') {
> - res = simple_strtoull(buf + 1, &end, 10);
> - if (res != 1 || *end != '\0')
> + int rc = kstrtoull(buf + 1, 10, &res);
> + if ((res != 1) || rc)
> return -EINVAL;
> *resp = RES_COUNTER_MAX;
Two more things!
- there should be a newline after definitions, before code.
- we shouldn't overwrite the kstrtoull() return value. In this case it
might have returned -ERANGE but this code will replace that with EINVAL.
---
a/kernel/res_counter.c~kernel-res_counterc-replace-simple_strtoull-by-kstrtoull-fix
+++ a/kernel/res_counter.c
@@ -189,7 +189,10 @@ int res_counter_memparse_write_strategy(
/* return RES_COUNTER_MAX(unlimited) if "-1" is specified */
if (*buf == '-') {
int rc = kstrtoull(buf + 1, 10, &res);
- if ((res != 1) || rc)
+
+ if (rc)
+ return rc;
+ if (res != 1)
return -EINVAL;
*resp = RES_COUNTER_MAX;
return 0;
_
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
