Merge branch 'next' of git://git.infradead.org/users/pcmoore/selinux into next

[sfrench/cifs-2.6.git] / security / smack / smack_access.c

diff --git a/security/smack/smack_access.c b/security/smack/smack_access.c
index c062e9467b62f91cb2b975f271de60755d66248c..f97d0842e6217a3578caa85730c95ce6b5683087 100644 (file)
--- a/security/smack/smack_access.c
+++ b/security/smack/smack_access.c
@@ -457,19 +457,16 @@ int smk_netlbl_mls(int level, char *catset, struct netlbl_lsm_secattr *sap,
 
        sap->flags |= NETLBL_SECATTR_MLS_CAT;
        sap->attr.mls.lvl = level;
-       sap->attr.mls.cat = netlbl_secattr_catmap_alloc(GFP_ATOMIC);
-       if (!sap->attr.mls.cat)
-               return -ENOMEM;
-       sap->attr.mls.cat->startbit = 0;
+       sap->attr.mls.cat = NULL;
 
        for (cat = 1, cp = catset, byte = 0; byte < len; cp++, byte++)
                for (m = 0x80; m != 0; m >>= 1, cat++) {
                        if ((m & *cp) == 0)
                                continue;
-                       rc = netlbl_secattr_catmap_setbit(sap->attr.mls.cat,
-                                                         cat, GFP_ATOMIC);
+                       rc = netlbl_catmap_setbit(&sap->attr.mls.cat,
+                                                 cat, GFP_ATOMIC);
                        if (rc < 0) {
-                               netlbl_secattr_catmap_free(sap->attr.mls.cat);
+                               netlbl_catmap_free(sap->attr.mls.cat);
                                return rc;
                        }
                }