Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit b318e0e4ef4e85812c25afa19f75addccc834cd4

Authored by Herbert Xu
Committed by David S. Miller
1 parent 45b5035482
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

[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>

Showing 7 changed files with 15 additions and 10 deletions Side-by-side Diff

... ... @@ -508,7 +508,10 @@
508 508 } header;
509 509  
510 510 /* Sequence number for replay protection. */
511   - u64 seq;
  511 + union {
  512 + u64 output;
  513 + __be32 input;
  514 + } seq;
512 515 };
513 516  
514 517 #define XFRM_SKB_CB(__skb) ((struct xfrm_skb_cb *)&((__skb)->cb[0]))
... ... @@ -96,7 +96,7 @@
96 96  
97 97 ah->reserved = 0;
98 98 ah->spi = x->id.spi;
99   - ah->seq_no = htonl(XFRM_SKB_CB(skb)->seq);
  99 + ah->seq_no = htonl(XFRM_SKB_CB(skb)->seq.output);
100 100  
101 101 spin_lock_bh(&x->lock);
102 102 err = ah_mac_digest(ahp, skb, ah->auth_data);
... ... @@ -199,7 +199,7 @@
199 199 }
200 200  
201 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 204 sg_init_table(sg, nfrags);
205 205 skb_to_sgvec(skb, sg,
... ... @@ -210,7 +210,8 @@
210 210 aead_givcrypt_set_callback(req, 0, esp_output_done, skb);
211 211 aead_givcrypt_set_crypt(req, sg, sg, clen, iv);
212 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 216 ESP_SKB_CB(skb)->tmp = tmp;
216 217 err = crypto_aead_givencrypt(req);
... ... @@ -283,7 +283,7 @@
283 283  
284 284 ah->reserved = 0;
285 285 ah->spi = x->id.spi;
286   - ah->seq_no = htonl(XFRM_SKB_CB(skb)->seq);
  286 + ah->seq_no = htonl(XFRM_SKB_CB(skb)->seq.output);
287 287  
288 288 spin_lock_bh(&x->lock);
289 289 err = ah_mac_digest(ahp, skb, ah->auth_data);
... ... @@ -188,7 +188,7 @@
188 188 *skb_mac_header(skb) = IPPROTO_ESP;
189 189  
190 190 esph->spi = x->id.spi;
191   - esph->seq_no = htonl(XFRM_SKB_CB(skb)->seq);
  191 + esph->seq_no = htonl(XFRM_SKB_CB(skb)->seq.output);
192 192  
193 193 sg_init_table(sg, nfrags);
194 194 skb_to_sgvec(skb, sg,
... ... @@ -199,7 +199,8 @@
199 199 aead_givcrypt_set_callback(req, 0, esp_output_done, skb);
200 200 aead_givcrypt_set_crypt(req, sg, sg, clen, iv);
201 201 aead_givcrypt_set_assoc(req, asg, sizeof(*esph));
202   - aead_givcrypt_set_giv(req, esph->enc_data, XFRM_SKB_CB(skb)->seq);
  202 + aead_givcrypt_set_giv(req, esph->enc_data,
  203 + XFRM_SKB_CB(skb)->seq.output);
203 204  
204 205 ESP_SKB_CB(skb)->tmp = tmp;
205 206 err = crypto_aead_givencrypt(req);
net/xfrm/xfrm_input.c
Diff comments   View file @ b318e0e
... ... @@ -109,7 +109,7 @@
109 109 if (encap_type < 0) {
110 110 async = 1;
111 111 x = xfrm_input_state(skb);
112   - seq = XFRM_SKB_CB(skb)->seq;
  112 + seq = XFRM_SKB_CB(skb)->seq.input;
113 113 goto resume;
114 114 }
115 115  
... ... @@ -175,7 +175,7 @@
175 175  
176 176 spin_unlock(&x->lock);
177 177  
178   - XFRM_SKB_CB(skb)->seq = seq;
  178 + XFRM_SKB_CB(skb)->seq.input = seq;
179 179  
180 180 nexthdr = x->type->input(x, skb);
181 181  
net/xfrm/xfrm_output.c
Diff comments   View file @ b318e0e
... ... @@ -62,7 +62,7 @@
62 62 }
63 63  
64 64 if (x->type->flags & XFRM_TYPE_REPLAY_PROT) {
65   - XFRM_SKB_CB(skb)->seq = ++x->replay.oseq;
  65 + XFRM_SKB_CB(skb)->seq.output = ++x->replay.oseq;
66 66 if (unlikely(x->replay.oseq == 0)) {
67 67 XFRM_INC_STATS(LINUX_MIB_XFRMOUTSTATESEQERROR);
68 68 x->replay.oseq--;