Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[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
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -281,7 +281,7 @@ u32 selinux_socket_getpeer_dgram(struct sk_buff *skb)
		int 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)) {
				struct xfrm_sec_ctx *ctx = x->security;
				return ctx->ctx_sid;
@@ -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.
		 */
		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))
				goto accept;