diff options
| author | James Morris <james.l.morris@oracle.com> | 2014-08-02 14:58:02 +0200 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2014-08-02 14:58:02 +0200 |
| commit | 103ae675b12dee75ec099abf3d22857d1384b3bc (patch) | |
| tree | a6b4f71bc911e7283b6573ee5833cd36a3ac2469 /security/smack/smack_access.c | |
| parent | tpm: simplify code by using %*phN specifier (diff) | |
| parent | netlabel: shorter names for the NetLabel catmap funcs/structs (diff) | |
| download | linux-103ae675b12dee75ec099abf3d22857d1384b3bc.tar.xz linux-103ae675b12dee75ec099abf3d22857d1384b3bc.zip | |
Merge branch 'next' of git://git.infradead.org/users/pcmoore/selinux into next
Diffstat (limited to 'security/smack/smack_access.c')
| -rw-r--r-- | security/smack/smack_access.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/security/smack/smack_access.c b/security/smack/smack_access.c index c062e9467b62..f97d0842e621 100644 --- 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; } } |