summaryrefslogtreecommitdiffstats
path: root/security/selinux
diff options
context:
space:
mode:
authorEric Paris <eparis@redhat.com>2010-10-13 17:50:14 -0400
committerJames Morris <jmorris@namei.org>2010-10-21 10:12:56 +1100
commit4419aae1f4f380a3fba0f4f12ffbbbdf3f267c51 (patch)
treee2f7e4850dc84768f6dd66e38a1454b8e3574714 /security/selinux
parentb28efd54d9d5c8005a29cd8782335beb9daaa32d (diff)
downloadlinux-4419aae1f4f380a3fba0f4f12ffbbbdf3f267c51.tar.gz
linux-4419aae1f4f380a3fba0f4f12ffbbbdf3f267c51.tar.bz2
linux-4419aae1f4f380a3fba0f4f12ffbbbdf3f267c51.zip
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: Eric Paris <eparis@redhat.com> Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security/selinux')
-rw-r--r--security/selinux/ss/policydb.c16
1 files changed, 13 insertions, 3 deletions
diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c
index aa5a2fd1cc09..97fb0cf0eb69 100644
--- a/security/selinux/ss/policydb.c
+++ b/security/selinux/ss/policydb.c
@@ -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;
}
/*