aboutsummaryrefslogtreecommitdiffstats
path: root/security/selinux/xfrm.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-04-12 16:54:43 -0400
committerJeff Garzik <jeff@garzik.org>2006-04-12 16:54:43 -0400
commita890b15c0990cc8d686edcc85f5fccde71ad5ce9 (patch)
tree73162355b58283a2531f13fbbf663809f95c1483 /security/selinux/xfrm.c
parent79fa1b677be3a985cc66b9218a4dd09818f1051b (diff)
parent26ec634c31a11a003040e10b4d650495158632fd (diff)
Merge branch 'upstream'
Diffstat (limited to 'security/selinux/xfrm.c')
-rw-r--r--security/selinux/xfrm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/security/selinux/xfrm.c b/security/selinux/xfrm.c
index dfab6c886698..abe99d881376 100644
--- a/security/selinux/xfrm.c
+++ b/security/selinux/xfrm.c
@@ -281,7 +281,7 @@ u32 selinux_socket_getpeer_dgram(struct sk_buff *skb)
281 int i; 281 int i;
282 282
283 for (i = sp->len-1; i >= 0; i--) { 283 for (i = sp->len-1; i >= 0; i--) {
284 struct xfrm_state *x = sp->x[i].xvec; 284 struct xfrm_state *x = sp->xvec[i];
285 if (selinux_authorizable_xfrm(x)) { 285 if (selinux_authorizable_xfrm(x)) {
286 struct xfrm_sec_ctx *ctx = x->security; 286 struct xfrm_sec_ctx *ctx = x->security;
287 return ctx->ctx_sid; 287 return ctx->ctx_sid;
@@ -314,7 +314,7 @@ int selinux_xfrm_sock_rcv_skb(u32 isec_sid, struct sk_buff *skb)
314 * Only need to verify the existence of an authorizable sp. 314 * Only need to verify the existence of an authorizable sp.
315 */ 315 */
316 for (i = 0; i < sp->len; i++) { 316 for (i = 0; i < sp->len; i++) {
317 struct xfrm_state *x = sp->x[i].xvec; 317 struct xfrm_state *x = sp->xvec[i];
318 318
319 if (x && selinux_authorizable_xfrm(x)) 319 if (x && selinux_authorizable_xfrm(x))
320 goto accept; 320 goto accept;