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

Commit 17d213f8 authored by Li Zefan's avatar Li Zefan Committed by Linus Torvalds
Browse files

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: default avatarLi Zefan <lizf@cn.fujitsu.com>
Acked-by: default avatarSerge 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0302c01b

security/device_cgroup.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -222,7 +222,7 @@ static void devcgroup_destroy(struct cgroup_subsys *ss, 
#define DEVCG_DENY 2

#define DEVCG_DENY 2

#define DEVCG_LIST 3

#define DEVCG_LIST 3





#define MAJMINLEN 10

#define MAJMINLEN 13

#define ACCLEN 4

#define ACCLEN 4





static void set_access(char *acc, short access)

static void set_access(char *acc, short access)
@@ -254,7 +254,7 @@ static void set_majmin(char *str, unsigned m) 
	if (m == ~0)

	if (m == ~0)

		sprintf(str, "*");

		sprintf(str, "*");

	else

	else

		snprintf(str, MAJMINLEN, "%d", m);

		snprintf(str, MAJMINLEN, "%u", m);

}

}





static int devcgroup_seq_read(struct cgroup *cgroup, struct cftype *cft,

static int devcgroup_seq_read(struct cgroup *cgroup, struct cftype *cft,