lkml.org 
[lkml]   [2012]   [Oct]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 3/4] device_cgroup: stop using simple_strtoul()
Quoting Aristeu Rozanski (aris@redhat.com):
> 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
>
>
> Cc: Dave Jones <davej@redhat.com>
> Cc: Andrew Morton <akpm@linux-foundation.org>
> Cc: Tejun Heo <tj@kernel.org>
> Cc: Li Zefan <lizefan@huawei.com>
> Cc: James Morris <jmorris@namei.org>
> Cc: Pavel Emelyanov <xemul@openvz.org>
> Cc: Serge Hallyn <serge.hallyn@canonical.com>

Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>

> Cc: Jiri Slaby <jslaby@suse.cz>
> Signed-off-by: Aristeu Rozanski <aris@redhat.com>
>
> ---
> security/device_cgroup.c | 28 ++++++++++++++++++++++------
> 1 file changed, 22 insertions(+), 6 deletions(-)
>
> --- github.orig/security/device_cgroup.c 2012-10-19 16:35:46.366102913 -0400
> +++ github/security/device_cgroup.c 2012-10-19 16:35:50.801229331 -0400
> @@ -361,8 +361,8 @@ static int devcgroup_update_access(struc
> 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_exception_item ex;
>
> if (!capable(CAP_SYS_ADMIN))
> @@ -405,8 +405,16 @@ return 0;
> ex.major = ~0;
> b++;
> } else if (isdigit(*b)) {
> - ex.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, &ex.major);
> + if (rc)
> + return -EINVAL;
> } else {
> return -EINVAL;
> }
> @@ -419,8 +427,16 @@ ex.major = simple_strtoul(b, &endp, 10
> ex.minor = ~0;
> b++;
> } else if (isdigit(*b)) {
> - ex.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, &ex.minor);
> + if (rc)
> + return -EINVAL;
> } else {
> return -EINVAL;
> }
>


\
 
 \ /
  Last update: 2012-10-22 19:01    [W:0.200 / U:0.244 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site