diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2008-02-13 01:50:35 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-02-13 01:50:35 -0500 |
commit | b318e0e4ef4e85812c25afa19f75addccc834cd4 (patch) | |
tree | 95d51df1aa01978a99e763cd92fd6f7f4647bf20 /net/ipv4/esp4.c | |
parent | 45b503548210fe6f23e92b856421c2a3f05fd034 (diff) |
[IPSEC]: Fix bogus usage of u64 on input sequence number
Al Viro spotted a bogus use of u64 on the input sequence number which
is big-endian. This patch fixes it by giving the input sequence number
its own member in the xfrm_skb_cb structure.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/esp4.c')
-rw-r--r-- | net/ipv4/esp4.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c index 258d17631b4b..091e6709f831 100644 --- a/net/ipv4/esp4.c +++ b/net/ipv4/esp4.c | |||
@@ -199,7 +199,7 @@ static int esp_output(struct xfrm_state *x, struct sk_buff *skb) | |||
199 | } | 199 | } |
200 | 200 | ||
201 | esph->spi = x->id.spi; | 201 | esph->spi = x->id.spi; |
202 | esph->seq_no = htonl(XFRM_SKB_CB(skb)->seq); | 202 | esph->seq_no = htonl(XFRM_SKB_CB(skb)->seq.output); |
203 | 203 | ||
204 | sg_init_table(sg, nfrags); | 204 | sg_init_table(sg, nfrags); |
205 | skb_to_sgvec(skb, sg, | 205 | skb_to_sgvec(skb, sg, |
@@ -210,7 +210,8 @@ static int esp_output(struct xfrm_state *x, struct sk_buff *skb) | |||
210 | aead_givcrypt_set_callback(req, 0, esp_output_done, skb); | 210 | aead_givcrypt_set_callback(req, 0, esp_output_done, skb); |
211 | aead_givcrypt_set_crypt(req, sg, sg, clen, iv); | 211 | aead_givcrypt_set_crypt(req, sg, sg, clen, iv); |
212 | aead_givcrypt_set_assoc(req, asg, sizeof(*esph)); | 212 | aead_givcrypt_set_assoc(req, asg, sizeof(*esph)); |
213 | aead_givcrypt_set_giv(req, esph->enc_data, XFRM_SKB_CB(skb)->seq); | 213 | aead_givcrypt_set_giv(req, esph->enc_data, |
214 | XFRM_SKB_CB(skb)->seq.output); | ||
214 | 215 | ||
215 | ESP_SKB_CB(skb)->tmp = tmp; | 216 | ESP_SKB_CB(skb)->tmp = tmp; |
216 | err = crypto_aead_givencrypt(req); | 217 | err = crypto_aead_givencrypt(req); |