Commit 7bbf91ce authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec 



Steffen Klassert says:

====================
pull request (net): ipsec 2016-12-01

1) Change the error value when someone tries to run 32bit
   userspace on a 64bit host from -ENOTSUPP to the userspace
   exported -EOPNOTSUPP. Fix from Yi Zhao.

2) On inbound, ESN sequence numbers are already in network
   byte order. So don't try to convert it again, this fixes
   integrity verification for ESN. Fixes from Tobias Brunner.

Please pull or let me know if there are problems.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 3d2dd617 a55e2386

net/ipv4/esp4.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -476,7 +476,7 @@ static int esp_input(struct xfrm_state *x, struct sk_buff *skb) 
		esph = (void *)skb_push(skb, 4);

		esph = (void *)skb_push(skb, 4);

		*seqhi = esph->spi;

		*seqhi = esph->spi;

		esph->spi = esph->seq_no;

		esph->spi = esph->seq_no;

		esph->seq_no = htonl(XFRM_SKB_CB(skb)->seq.input.hi);

		esph->seq_no = XFRM_SKB_CB(skb)->seq.input.hi;

		aead_request_set_callback(req, 0, esp_input_done_esn, skb);

		aead_request_set_callback(req, 0, esp_input_done_esn, skb);

	}

	}

net/ipv6/esp6.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -418,7 +418,7 @@ static int esp6_input(struct xfrm_state *x, struct sk_buff *skb) 
		esph = (void *)skb_push(skb, 4);

		esph = (void *)skb_push(skb, 4);

		*seqhi = esph->spi;

		*seqhi = esph->spi;

		esph->spi = esph->seq_no;

		esph->spi = esph->seq_no;

		esph->seq_no = htonl(XFRM_SKB_CB(skb)->seq.input.hi);

		esph->seq_no = XFRM_SKB_CB(skb)->seq.input.hi;

		aead_request_set_callback(req, 0, esp_input_done_esn, skb);

		aead_request_set_callback(req, 0, esp_input_done_esn, skb);

	}

	}

net/xfrm/xfrm_user.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -2450,7 +2450,7 @@ static int xfrm_user_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) 




#ifdef CONFIG_COMPAT

#ifdef CONFIG_COMPAT

	if (in_compat_syscall())

	if (in_compat_syscall())

		return -ENOTSUPP;

		return -EOPNOTSUPP;

#endif

#endif





	type = nlh->nlmsg_type;

	type = nlh->nlmsg_type;

CRA Git | Maintained and supported by SUSTech CRA and CCSE