Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 26fd8405 authored by Aristeu Rozanski's avatar Aristeu Rozanski Committed by Linus Torvalds
Browse files

device_cgroup: stop using simple_strtoul() 



Convert 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: default avatarAristeu Rozanski <aris@redhat.com>
Cc: Dave Jones <davej@redhat.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: Li Zefan <lizefan@huawei.com>
Cc: James Morris <jmorris@namei.org>
Cc: Pavel Emelyanov <xemul@openvz.org>
Acked-by: default avatarSerge Hallyn <serge.hallyn@canonical.com>
Cc: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 5b7aa7d5

security/device_cgroup.c

+22 −6
Original line number Diff line number Diff line
@@ -361,8 +361,8 @@ static int devcgroup_update_access(struct dev_cgroup *devcgroup, 
				   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 @@ static int devcgroup_update_access(struct dev_cgroup *devcgroup, 
		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 @@ static int devcgroup_update_access(struct dev_cgroup *devcgroup, 
		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;

	}