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

Commit 4419aae1 authored by Eric Paris's avatar Eric Paris Committed by James Morris
Browse files

SELinux: deterministic ordering of range transition rules 



Range transition rules are placed in the hash table in an (almost)
arbitrary order.  This patch inserts them in a fixed order to make policy
retrival more predictable.

Signed-off-by: default avatarEric Paris <eparis@redhat.com>
Signed-off-by: default avatarJames Morris <jmorris@namei.org>
parent b28efd54

security/selinux/ss/policydb.c

+13 −3
Original line number Diff line number Diff line
@@ -185,9 +185,19 @@ static u32 rangetr_hash(struct hashtab *h, const void *k) 
static int rangetr_cmp(struct hashtab *h, const void *k1, const void *k2)

{

	const struct range_trans *key1 = k1, *key2 = k2;

	return (key1->source_type != key2->source_type ||

		key1->target_type != key2->target_type ||

		key1->target_class != key2->target_class);

	int v;



	v = key1->source_type - key2->source_type;

	if (v)

		return v;



	v = key1->target_type - key2->target_type;

	if (v)

		return v;



	v = key1->target_class - key2->target_class;



	return v;

}



/*