Commit 002903e1 authored by Christian Göttsche's avatar Christian Göttsche Committed by Paul Moore
Browse files

selinux: update type for number of class permissions in services code 



Security classes have only up to 32 permissions, hence using an u16 is
sufficient (while improving padding in struct selinux_mapping).

Signed-off-by: default avatarChristian Göttsche <cgzones@googlemail.com>
Signed-off-by: default avatarPaul Moore <paul@paul-moore.com>
parent df9d4749

security/selinux/ss/services.c

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,6 @@ static int selinux_set_mapping(struct policydb *pol, 
			       struct selinux_map *out_map)

{

	u16 i, j;

	unsigned k;

	bool print_unknown_handle = false;



	/* Find number of classes in the input mapping */
@@ -117,6 +116,7 @@ static int selinux_set_mapping(struct policydb *pol, 
	while (map[j].name) {

		const struct security_class_mapping *p_in = map + (j++);

		struct selinux_mapping *p_out = out_map->mapping + j;

		u16 k;



		/* An empty class string skips ahead */

		if (!strcmp(p_in->name, "")) {

security/selinux/ss/services.h

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
/* Mapping for a single class */

struct selinux_mapping {

	u16 value; /* policy value for class */

	unsigned int num_perms; /* number of permissions in class */

	u16 num_perms; /* number of permissions in class */

	u32 perms[sizeof(u32) * 8]; /* policy values for permissions */

};