netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH net 1/2] esp4: Fix integrity verification when ESN are used
@ 2016-11-29 16:05 Tobias Brunner
  2016-11-30  9:58 ` Herbert Xu
  0 siblings, 1 reply; 3+ messages in thread
From: Tobias Brunner @ 2016-11-29 16:05 UTC (permalink / raw)
  To: David S. Miller, Herbert Xu; +Cc: Steffen Klassert, netdev

When handling inbound packets, the two halves of the sequence number
stored on the skb are already in network order.

Fixes: 7021b2e1cddd ("esp4: Switch to new AEAD interface")
Signed-off-by: Tobias Brunner <tobias@strongswan.org>
---
 net/ipv4/esp4.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c
index d95631d09248..20fb25e3027b 100644
--- a/net/ipv4/esp4.c
+++ b/net/ipv4/esp4.c
@@ -476,7 +476,7 @@ static int esp_input(struct xfrm_state *x, struct sk_buff *skb)
 		esph = (void *)skb_push(skb, 4);
 		*seqhi = esph->spi;
 		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);
 	}
 
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH net 1/2] esp4: Fix integrity verification when ESN are used
  2016-11-29 16:05 [PATCH net 1/2] esp4: Fix integrity verification when ESN are used Tobias Brunner
@ 2016-11-30  9:58 ` Herbert Xu
  2016-11-30 12:17   ` Steffen Klassert
  0 siblings, 1 reply; 3+ messages in thread
From: Herbert Xu @ 2016-11-30  9:58 UTC (permalink / raw)
  To: Tobias Brunner; +Cc: David S. Miller, Steffen Klassert, netdev

On Tue, Nov 29, 2016 at 05:05:20PM +0100, Tobias Brunner wrote:
> When handling inbound packets, the two halves of the sequence number
> stored on the skb are already in network order.
> 
> Fixes: 7021b2e1cddd ("esp4: Switch to new AEAD interface")
> Signed-off-by: Tobias Brunner <tobias@strongswan.org>

Acked-by: Herbert Xu <herbert@gondor.apana.org.au>

Thanks for catching this!
-- 
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH net 1/2] esp4: Fix integrity verification when ESN are used
  2016-11-30  9:58 ` Herbert Xu
@ 2016-11-30 12:17   ` Steffen Klassert
  0 siblings, 0 replies; 3+ messages in thread
From: Steffen Klassert @ 2016-11-30 12:17 UTC (permalink / raw)
  To: Herbert Xu; +Cc: Tobias Brunner, David S. Miller, netdev

On Wed, Nov 30, 2016 at 05:58:27PM +0800, Herbert Xu wrote:
> On Tue, Nov 29, 2016 at 05:05:20PM +0100, Tobias Brunner wrote:
> > When handling inbound packets, the two halves of the sequence number
> > stored on the skb are already in network order.
> > 
> > Fixes: 7021b2e1cddd ("esp4: Switch to new AEAD interface")
> > Signed-off-by: Tobias Brunner <tobias@strongswan.org>
> 
> Acked-by: Herbert Xu <herbert@gondor.apana.org.au>

Applied to the ipsec tree, thanks!

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2016-11-30 12:17 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-11-29 16:05 [PATCH net 1/2] esp4: Fix integrity verification when ESN are used Tobias Brunner
2016-11-30  9:58 ` Herbert Xu
2016-11-30 12:17   ` Steffen Klassert

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).