Commit 67644726 authored by Dave Jones's avatar Dave Jones Committed by Linus Torvalds

[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: default avatarDave Jones <davej@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 66004a6c
...@@ -281,7 +281,7 @@ u32 selinux_socket_getpeer_dgram(struct sk_buff *skb) ...@@ -281,7 +281,7 @@ u32 selinux_socket_getpeer_dgram(struct sk_buff *skb)
int i; int i;
for (i = sp->len-1; i >= 0; i--) { for (i = sp->len-1; i >= 0; i--) {
struct xfrm_state *x = sp->x[i].xvec; struct xfrm_state *x = sp->xvec[i];
if (selinux_authorizable_xfrm(x)) { if (selinux_authorizable_xfrm(x)) {
struct xfrm_sec_ctx *ctx = x->security; struct xfrm_sec_ctx *ctx = x->security;
return ctx->ctx_sid; return ctx->ctx_sid;
...@@ -314,7 +314,7 @@ int selinux_xfrm_sock_rcv_skb(u32 isec_sid, struct sk_buff *skb) ...@@ -314,7 +314,7 @@ int selinux_xfrm_sock_rcv_skb(u32 isec_sid, struct sk_buff *skb)
* Only need to verify the existence of an authorizable sp. * Only need to verify the existence of an authorizable sp.
*/ */
for (i = 0; i < sp->len; i++) { for (i = 0; i < sp->len; i++) {
struct xfrm_state *x = sp->x[i].xvec; struct xfrm_state *x = sp->xvec[i];
if (x && selinux_authorizable_xfrm(x)) if (x && selinux_authorizable_xfrm(x))
goto accept; goto accept;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment