Skip to contentSkip to conversation

devcgroup: code cleanup

PATCH In review Li Zefan 2 participants 2 messages Jul 8, 2008 – Jul 13, 2008 Security (LSM)

lore
Share & tools
lore

Li Zefan

author
#0 lore raw

PATCH 3/3 devcgroup: code cleanup

- clean up set_majmin()
- use simple_strtoul() to parse major/minor

Signed-off-by Li Zefan <[email protected]>
Acked-by Serge Hallyn <[email protected]>
---
 security/device_cgroup.c |   19 +++++--------------
 1 files changed, 5 insertions(+), 14 deletions(-)
security/device_cgroup.c +5 -14
index ddd92ce..34a10bf 100644
@@ -188,7 +188,7 @@ static struct cgroup_subsys_state *devcgroup_create(struct cgroup_subsys *ss,
 		}
 		wh->minor = wh->major = ~0;
 		wh->type = DEV_ALL;
-		wh->access = ACC_MKNOD | ACC_READ | ACC_WRITE;
+		wh->access = ACC_MASK;
 		list_add(&wh->list, &dev_cgroup->whitelist);
 	} else {
 		parent_dev_cgroup = cgroup_to_devcgroup(parent_cgroup);

@@ -250,11 +250,10 @@ static char type_to_char(short type)
 
 static void set_majmin(char *str, unsigned m)
 {
-	memset(str, 0, MAJMINLEN);
 	if (m == ~0)
-		sprintf(str, "*");
+		strcpy(str, "*");
 	else
-		snprintf(str, MAJMINLEN, "%u", m);
+		sprintf(str, "%u", m);
 }
 
 static int devcgroup_seq_read(struct cgroup *cgroup, struct cftype *cft,

@@ -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);
 	} else {
 		retval = -EINVAL;
 		goto out2;
Signature · 1 line
1.5.4.rc3
#1 lore raw
Quoted 14 lines · On Tue, 08 Jul 2008 09:51:13 +0800 Li Zefan <[email protected]> wrote:
(quoted diff) +1 -5
@@ -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;

Review static ssize_t devcgroup_access_write(struct cgroup *cgroup, struct cftype *cft, · line 423

Quoted 9 lines
(quoted diff) +1 -5
@@ -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:

security/device_cgroup.c renamed from security/device_cgroup.c~devcgroup-code-cleanup-fix +2 -2
@@ -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;
 	}

_