Re: [PATCH 3/3] devcgroup: code cleanup

From: Andrew Morton
Date: Sun Jul 13 2008 - 02:04:43 EST


On Tue, 08 Jul 2008 09:51:13 +0800 Li Zefan <lizf@xxxxxxxxxxxxxx> wrote:

> @@ -405,11 +404,7 @@ static ssize_t devcgroup_access_write(struct cgroup *cgroup, struct cftype *cft,
> wh.major = ~0;
> b++;
> } else if (isdigit(*b)) {
> - wh.major = 0;
> - while (isdigit(*b)) {
> - wh.major = wh.major*10+(*b-'0');
> - b++;
> - }
> + wh.major = simple_strtoul(b, &b, 0);
> } else {
> retval = -EINVAL;
> goto out2;
> @@ -425,11 +420,7 @@ static ssize_t devcgroup_access_write(struct cgroup *cgroup, struct cftype *cft,
> wh.minor = ~0;
> b++;
> } else if (isdigit(*b)) {
> - wh.minor = 0;
> - while (isdigit(*b)) {
> - wh.minor = wh.minor*10+(*b-'0');
> - b++;
> - }
> + wh.minor = simple_strtoul(b, &b, 0);

This is an interface change. Previously we only took decimal input.
Now, we accept decimal or octal or hex, based upon automagic detection.

So scripts which were feeding in "010" will now be setting things to eight,
not to ten.

Methinks we should do this:

--- a/security/device_cgroup.c~devcgroup-code-cleanup-fix
+++ a/security/device_cgroup.c
@@ -394,7 +394,7 @@ static int devcgroup_update_access(struc
wh.major = ~0;
b++;
} else if (isdigit(*b)) {
- wh.major = simple_strtoul(b, &b, 0);
+ wh.major = simple_strtoul(b, &b, 10);
} else {
return -EINVAL;
}
@@ -407,7 +407,7 @@ static int devcgroup_update_access(struc
wh.minor = ~0;
b++;
} else if (isdigit(*b)) {
- wh.minor = simple_strtoul(b, &b, 0);
+ wh.minor = simple_strtoul(b, &b, 10);
} 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/