Merge tag 'selinux-pr-20190917' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-block.git] / security / selinux / ss / services.c

diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c
index d61563a3695e4d48a04a2b65ce7cb3142de712e4..3a29e7c24ba936f38a934e78dc9893c71e97eeeb 100644 (file)
--- a/security/selinux/ss/services.c
+++ b/security/selinux/ss/services.c
@@ -542,13 +542,13 @@ static void type_attribute_bounds_av(struct policydb *policydb,
        struct type_datum *target;
        u32 masked = 0;
 
-       source = policydb->type_val_to_struct_array[scontext->type - 1];
+       source = policydb->type_val_to_struct[scontext->type - 1];
        BUG_ON(!source);
 
        if (!source->bounds)
                return;
 
-       target = policydb->type_val_to_struct_array[tcontext->type - 1];
+       target = policydb->type_val_to_struct[tcontext->type - 1];
        BUG_ON(!target);
 
        memset(&lo_avd, 0, sizeof(lo_avd));
@@ -891,7 +891,7 @@ int security_bounded_transition(struct selinux_state *state,
 
        index = new_context->type;
        while (true) {
-               type = policydb->type_val_to_struct_array[index - 1];
+               type = policydb->type_val_to_struct[index - 1];
                BUG_ON(!type);
 
                /* not bounded anymore */