Quoting Aristeu Rozanski (aris@xxxxxxxxxx):
> This patch converts the code to use kstrtou32() instead of simple_strtoul()
> which is deprecated. The real size of the variables are u32, so use kstrtou32
> instead of kstrtoul
>
> Signed-off-by: Aristeu Rozanski <aris@xxxxxxxxxx>
phew, i'm afraid i'm not up on the latest 'best parsing techniques'
but the end result looks correct (just not sure it's optimal).
Acked-by: Serge Hallyn <serge.hallyn@xxxxxxxxxxxxx>
>
> ---
> security/device_cgroup.c | 28 ++++++++++++++++++++++------
> 1 file changed, 22 insertions(+), 6 deletions(-)
>
> Index: github/security/device_cgroup.c
> ===================================================================
> --- github.orig/security/device_cgroup.c 2012-08-21 10:51:05.751689805 -0400
> +++ github/security/device_cgroup.c 2012-08-21 10:51:15.015951623 -0400
> @@ -361,8 +361,8 @@
> int filetype, const char *buffer)
> {
> const char *b;
> - char *endp;
> - int count;
> + char temp[12]; /* 11 + 1 characters needed for a u32 */
> + int count, rc;
> struct dev_whitelist_item wh;
>
> if (!capable(CAP_SYS_ADMIN))
> @@ -405,8 +405,16 @@
> wh.major = ~0;
> b++;
> } else if (isdigit(*b)) {
> - wh.major = simple_strtoul(b, &endp, 10);
> - b = endp;
> + memset(temp, 0, sizeof(temp));
> + for (count = 0; count < sizeof(temp) - 1; count++) {
> + temp[count] = *b;
> + b++;
> + if (!isdigit(*b))
> + break;
> + }
> + rc = kstrtou32(temp, 10, &wh.major);
> + if (rc)
> + return -EINVAL;
> } else {
> return -EINVAL;
> }
> @@ -419,8 +427,16 @@
> wh.minor = ~0;
> b++;
> } else if (isdigit(*b)) {
> - wh.minor = simple_strtoul(b, &endp, 10);
> - b = endp;
> + memset(temp, 0, sizeof(temp));
> + for (count = 0; count < sizeof(temp) - 1; count++) {
> + temp[count] = *b;
> + b++;
> + if (!isdigit(*b))
> + break;
> + }
> + rc = kstrtou32(temp, 10, &wh.minor);
> + if (rc)
> + return -EINVAL;
> } else {
> return -EINVAL;
> }
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
--
To unsubscribe from this list: send the line "unsubscribe cgroups" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
