Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 1ce3644ade9c865c755bf0f6a4e109b7bb6eb60f

Authored by Steffen Klassert
Committed by David S. Miller
1 parent 9736acf395
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

xfrm: Use separate low and high order bits of the sequence numbers in xfrm_skb_cb 

To support IPsec extended sequence numbers, we split the
output sequence numbers of xfrm_skb_cb in low and high order 32 bits
and we add the high order 32 bits to the input sequence numbers.
All users are updated accordingly.

Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 7 changed files with 17 additions and 11 deletions Side-by-side Diff

... ... @@ -582,8 +582,14 @@
582 582  
583 583 /* Sequence number for replay protection. */
584 584 union {
585   - u64 output;
586   - __be32 input;
  585 + struct {
  586 + __u32 low;
  587 + __u32 hi;
  588 + } output;
  589 + struct {
  590 + __be32 low;
  591 + __be32 hi;
  592 + } input;
587 593 } seq;
588 594 };
589 595  
... ... @@ -208,7 +208,7 @@
208 208  
209 209 ah->reserved = 0;
210 210 ah->spi = x->id.spi;
211   - ah->seq_no = htonl(XFRM_SKB_CB(skb)->seq.output);
  211 + ah->seq_no = htonl(XFRM_SKB_CB(skb)->seq.output.low);
212 212  
213 213 sg_init_table(sg, nfrags);
214 214 skb_to_sgvec(skb, sg, 0, skb->len);
... ... @@ -215,7 +215,7 @@
215 215 }
216 216  
217 217 esph->spi = x->id.spi;
218   - esph->seq_no = htonl(XFRM_SKB_CB(skb)->seq.output);
  218 + esph->seq_no = htonl(XFRM_SKB_CB(skb)->seq.output.low);
219 219  
220 220 sg_init_table(sg, nfrags);
221 221 skb_to_sgvec(skb, sg,
... ... @@ -227,7 +227,7 @@
227 227 aead_givcrypt_set_crypt(req, sg, sg, clen, iv);
228 228 aead_givcrypt_set_assoc(req, asg, sizeof(*esph));
229 229 aead_givcrypt_set_giv(req, esph->enc_data,
230   - XFRM_SKB_CB(skb)->seq.output);
  230 + XFRM_SKB_CB(skb)->seq.output.low);
231 231  
232 232 ESP_SKB_CB(skb)->tmp = tmp;
233 233 err = crypto_aead_givencrypt(req);
... ... @@ -409,7 +409,7 @@
409 409  
410 410 ah->reserved = 0;
411 411 ah->spi = x->id.spi;
412   - ah->seq_no = htonl(XFRM_SKB_CB(skb)->seq.output);
  412 + ah->seq_no = htonl(XFRM_SKB_CB(skb)->seq.output.low);
413 413  
414 414 sg_init_table(sg, nfrags);
415 415 skb_to_sgvec(skb, sg, 0, skb->len);
... ... @@ -204,7 +204,7 @@
204 204 *skb_mac_header(skb) = IPPROTO_ESP;
205 205  
206 206 esph->spi = x->id.spi;
207   - esph->seq_no = htonl(XFRM_SKB_CB(skb)->seq.output);
  207 + esph->seq_no = htonl(XFRM_SKB_CB(skb)->seq.output.low);
208 208  
209 209 sg_init_table(sg, nfrags);
210 210 skb_to_sgvec(skb, sg,
... ... @@ -216,7 +216,7 @@
216 216 aead_givcrypt_set_crypt(req, sg, sg, clen, iv);
217 217 aead_givcrypt_set_assoc(req, asg, sizeof(*esph));
218 218 aead_givcrypt_set_giv(req, esph->enc_data,
219   - XFRM_SKB_CB(skb)->seq.output);
  219 + XFRM_SKB_CB(skb)->seq.output.low);
220 220  
221 221 ESP_SKB_CB(skb)->tmp = tmp;
222 222 err = crypto_aead_givencrypt(req);
net/xfrm/xfrm_input.c
Diff comments   View file @ 1ce3644
... ... @@ -118,7 +118,7 @@
118 118 if (encap_type < 0) {
119 119 async = 1;
120 120 x = xfrm_input_state(skb);
121   - seq = XFRM_SKB_CB(skb)->seq.input;
  121 + seq = XFRM_SKB_CB(skb)->seq.input.low;
122 122 goto resume;
123 123 }
124 124  
... ... @@ -184,7 +184,7 @@
184 184  
185 185 spin_unlock(&x->lock);
186 186  
187   - XFRM_SKB_CB(skb)->seq.input = seq;
  187 + XFRM_SKB_CB(skb)->seq.input.low = seq;
188 188  
189 189 nexthdr = x->type->input(x, skb);
190 190  
net/xfrm/xfrm_output.c
Diff comments   View file @ 1ce3644
... ... @@ -68,7 +68,7 @@
68 68 }
69 69  
70 70 if (x->type->flags & XFRM_TYPE_REPLAY_PROT) {
71   - XFRM_SKB_CB(skb)->seq.output = ++x->replay.oseq;
  71 + XFRM_SKB_CB(skb)->seq.output.low = ++x->replay.oseq;
72 72 if (unlikely(x->replay.oseq == 0)) {
73 73 XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTSTATESEQERROR);
74 74 x->replay.oseq--;