diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-07 02:24:28 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-07 02:24:28 +0300 |
| commit | d8d8f6a4fd635dcc9e4f946394c1fbde85eeab66 (patch) | |
| tree | 0a1bc8ff40c12bb30066467e11ae9153f89514e7 /security/selinux/xfrm.c | |
| parent | 57d1c91fa6d9146b309b7511f6432dea2a24858b (diff) | |
| parent | a2167dc62e9142b9a4bfb20f7e001c0f0a26fd8c (diff) | |
| download | linux-d8d8f6a4fd635dcc9e4f946394c1fbde85eeab66.tar.xz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'security/selinux/xfrm.c')
| -rw-r--r-- | security/selinux/xfrm.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/security/selinux/xfrm.c b/security/selinux/xfrm.c index c4d87d4dca7b..5b7776504e4c 100644 --- a/security/selinux/xfrm.c +++ b/security/selinux/xfrm.c @@ -137,15 +137,9 @@ 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 */ - 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, - ASSOCIATION__RELABELTO, NULL); + ASSOCIATION__SETCONTEXT, NULL); if (rc) goto out; |