projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[Bluetooth] Fix firmware loading problem of BT3C driver
[powerpc.git]
/
security
/
selinux
/
xfrm.c
diff --git
a/security/selinux/xfrm.c
b/security/selinux/xfrm.c
index
c4d87d4
..
b2af7ca
100644
(file)
--- a/
security/selinux/xfrm.c
+++ b/
security/selinux/xfrm.c
@@
-137,22
+137,16
@@
static int selinux_xfrm_sec_ctx_alloc(struct xfrm_sec_ctx **ctxp, struct xfrm_us
* Must be permitted to relabel from default socket type (process type)
* to specified context
*/
* Must be permitted to relabel from default socket type (process type)
* to specified context
*/
- rc = avc_has_perm(tsec->sid, tsec->sid,
- SECCLASS_ASSOCIATION,
- ASSOCIATION__RELABELFROM, NULL);
- if (rc)
- goto out;
-
rc = avc_has_perm(tsec->sid, ctx->ctx_sid,
SECCLASS_ASSOCIATION,
rc = avc_has_perm(tsec->sid, ctx->ctx_sid,
SECCLASS_ASSOCIATION,
- ASSOCIATION__
RELABELTO
, NULL);
+ ASSOCIATION__
SETCONTEXT
, NULL);
if (rc)
goto out;
return rc;
out:
if (rc)
goto out;
return rc;
out:
- *ctxp =
0
;
+ *ctxp =
NULL
;
kfree(ctx);
return rc;
}
kfree(ctx);
return rc;
}