summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLi Zefan <lizf@cn.fujitsu.com>2008-07-13 12:14:02 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-13 12:51:18 -0700
commit17d213f806dad629e9af36fc45f082b87ed7bceb (patch)
treebbb91f06c39cddd1a05b0bdb8470f472c39c81c6
parent0302c01b4b793cfbc5c7bf8723f6d14bf9bd7cf4 (diff)
downloadlinux-3.10-17d213f806dad629e9af36fc45f082b87ed7bceb.tar.gz
linux-3.10-17d213f806dad629e9af36fc45f082b87ed7bceb.tar.bz2
linux-3.10-17d213f806dad629e9af36fc45f082b87ed7bceb.zip
devcgroup: always show positive major/minor num
# echo "b $((0x7fffffff)):$((0x80000000)) rwm" > devices.allow # cat devices.list b 214748364:-21474836 rwm though a major/minor number of 0x800000000 is meaningless, we should not cast it to a negative value. Signed-off-by: Li Zefan <lizf@cn.fujitsu.com> Acked-by: Serge Hallyn <serue@us.ibm.com> Cc: Serge Hallyn <serue@us.ibm.com> Cc: Paul Menage <menage@google.com> Cc: Pavel Emelyanov <xemul@openvz.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--security/device_cgroup.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/security/device_cgroup.c b/security/device_cgroup.c
index fd764a0858d..1e2e28afba4 100644
--- a/security/device_cgroup.c
+++ b/security/device_cgroup.c
@@ -222,7 +222,7 @@ static void devcgroup_destroy(struct cgroup_subsys *ss,
#define DEVCG_DENY 2
#define DEVCG_LIST 3
-#define MAJMINLEN 10
+#define MAJMINLEN 13
#define ACCLEN 4
static void set_access(char *acc, short access)
@@ -254,7 +254,7 @@ static void set_majmin(char *str, unsigned m)
if (m == ~0)
sprintf(str, "*");
else
- snprintf(str, MAJMINLEN, "%d", m);
+ snprintf(str, MAJMINLEN, "%u", m);
}
static int devcgroup_seq_read(struct cgroup *cgroup, struct cftype *cft,