aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Jones <davej@redhat.com>2006-04-03 02:34:19 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-04-09 15:35:53 -0400
commit67644726317a8274be4a3d0ef85b9ccebaa90304 (patch)
treec2bcf873d19d1b18d65e4f5d6d5c3cd613e9cb13
parent66004a6ca23f2a2408b32cbe27fda0389fb8f9dc (diff)
[SELINUX] Fix build after ipsec decap state changes.
security/selinux/xfrm.c: In function 'selinux_socket_getpeer_dgram': security/selinux/xfrm.c:284: error: 'struct sec_path' has no member named 'x' security/selinux/xfrm.c: In function 'selinux_xfrm_sock_rcv_skb': security/selinux/xfrm.c:317: error: 'struct sec_path' has no member named 'x' Signed-off-by: Dave Jones <davej@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-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;