diff options
| author | James Morris <james.l.morris@oracle.com> | 2014-08-02 22:58:02 +1000 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2014-08-02 22:58:02 +1000 |
| commit | 103ae675b12dee75ec099abf3d22857d1384b3bc (patch) | |
| tree | a6b4f71bc911e7283b6573ee5833cd36a3ac2469 /security/smack/smack_lsm.c | |
| parent | a3d64df849bcb84220bf6db5773a10eee1fad4dc (diff) | |
| parent | 4fbe63d1c773cceef3fe1f6ed0c9c268f4f24760 (diff) | |
| download | talos-obmc-linux-103ae675b12dee75ec099abf3d22857d1384b3bc.tar.gz talos-obmc-linux-103ae675b12dee75ec099abf3d22857d1384b3bc.zip | |
Merge branch 'next' of git://git.infradead.org/users/pcmoore/selinux into next
Diffstat (limited to 'security/smack/smack_lsm.c')
| -rw-r--r-- | security/smack/smack_lsm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c index f2c30801ce41..e6ab307ce86e 100644 --- a/security/smack/smack_lsm.c +++ b/security/smack/smack_lsm.c @@ -3209,9 +3209,9 @@ static struct smack_known *smack_from_secattr(struct netlbl_lsm_secattr *sap, break; } for (acat = -1, kcat = -1; acat == kcat; ) { - acat = netlbl_secattr_catmap_walk( - sap->attr.mls.cat, acat + 1); - kcat = netlbl_secattr_catmap_walk( + acat = netlbl_catmap_walk(sap->attr.mls.cat, + acat + 1); + kcat = netlbl_catmap_walk( skp->smk_netlabel.attr.mls.cat, kcat + 1); if (acat < 0 || kcat < 0) |
