SELinux: rename filename_compute_type argument to *type instead of *con

filename_compute_type() takes as arguments the numeric value of the type of
the subject and target.  It does not take a context.  Thus the names are
misleading.  Fix the argument names.

Signed-off-by: Eric Paris <[email protected]>
Reviewed-by: James Morris <[email protected]>

diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c
index 3e1ae85c01301b83b6fca1921933f2bfc5926a06..78bb8100b02e679b9f4ae58338afe1920dea6aa6 100644 (file)
--- a/security/selinux/ss/services.c
+++ b/security/selinux/ss/services.c
@@ -1359,13 +1359,13 @@ out:
 }
 
 static void filename_compute_type(struct policydb *p, struct context *newcontext,
-                                 u32 scon, u32 tcon, u16 tclass,
+                                 u32 stype, u32 ttype, u16 tclass,
                                  const char *objname)
 {
        struct filename_trans *ft;
        for (ft = p->filename_trans; ft; ft = ft->next) {
-               if (ft->stype == scon &&
-                   ft->ttype == tcon &&
+               if (ft->stype == stype &&
+                   ft->ttype == ttype &&
                    ft->tclass == tclass &&
                    !strcmp(ft->name, objname)) {
                        newcontext->type = ft->otype;