OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'next' of git://git.infradead.org/users/pcmoore/selinux into next
[uclinux-h8/linux.git]
/
security
/
smack
/
smack_lsm.c
diff --git
a/security/smack/smack_lsm.c
b/security/smack/smack_lsm.c
index
f2c3080
..
e6ab307
100644
(file)
--- 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; ) {
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)
skp->smk_netlabel.attr.mls.cat,
kcat + 1);
if (acat < 0 || kcat < 0)