Skip to content

Commit d549fdc

Browse files
committed
crypto: authencesn - Fix src offset when decrypting in-place
jira KERNEL-949 Rebuild_History Non-Buildable kernel-4.18.0-553.123.1.el8_10 commit-author Herbert Xu <herbert@gondor.apana.org.au> commit 1f48ad3 Empty-Commit: Cherry-Pick Conflicts during history rebuild. Will be included in final tarball splat. Ref for failed cherry-pick at: ciq/ciq_backports/kernel-4.18.0-553.123.1.el8_10/1f48ad3b.failed The src SG list offset wasn't set properly when decrypting in-place, fix it. Reported-by: Wolfgang Walter <linux@stwm.de> Fixes: e024941 ("crypto: authencesn - Do not place hiseq at end of dst for out-of-place decryption") Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> (cherry picked from commit 1f48ad3) Signed-off-by: Jonathan Maple <jmaple@ciq.com> # Conflicts: # crypto/authencesn.c
1 parent 04fd516 commit d549fdc

1 file changed

Lines changed: 42 additions & 0 deletions

File tree

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
crypto: authencesn - Fix src offset when decrypting in-place
2+
3+
jira KERNEL-949
4+
Rebuild_History Non-Buildable kernel-4.18.0-553.123.1.el8_10
5+
commit-author Herbert Xu <herbert@gondor.apana.org.au>
6+
commit 1f48ad3b19a9dfc947868edda0bb8e48e5b5a8fa
7+
Empty-Commit: Cherry-Pick Conflicts during history rebuild.
8+
Will be included in final tarball splat. Ref for failed cherry-pick at:
9+
ciq/ciq_backports/kernel-4.18.0-553.123.1.el8_10/1f48ad3b.failed
10+
11+
The src SG list offset wasn't set properly when decrypting in-place,
12+
fix it.
13+
14+
Reported-by: Wolfgang Walter <linux@stwm.de>
15+
Fixes: e02494114ebf ("crypto: authencesn - Do not place hiseq at end of dst for out-of-place decryption")
16+
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
17+
(cherry picked from commit 1f48ad3b19a9dfc947868edda0bb8e48e5b5a8fa)
18+
Signed-off-by: Jonathan Maple <jmaple@ciq.com>
19+
20+
# Conflicts:
21+
# crypto/authencesn.c
22+
diff --cc crypto/authencesn.c
23+
index a7c345f88223,af3d584e584f..000000000000
24+
--- a/crypto/authencesn.c
25+
+++ b/crypto/authencesn.c
26+
@@@ -265,8 -228,11 +265,15 @@@ static int crypto_authenc_esn_decrypt_t
27+
28+
decrypt:
29+
30+
++<<<<<<< HEAD
31+
+ sg_init_table(areq_ctx->dst, 2);
32+
++=======
33+
++>>>>>>> 1f48ad3b19a9 (crypto: authencesn - Fix src offset when decrypting in-place)
34+
dst = scatterwalk_ffwd(areq_ctx->dst, dst, assoclen);
35+
+ if (req->src == req->dst)
36+
+ src = dst;
37+
+ else
38+
+ src = scatterwalk_ffwd(areq_ctx->src, src, assoclen);
39+
40+
skcipher_request_set_tfm(skreq, ctx->enc);
41+
skcipher_request_set_callback(skreq, flags,
42+
* Unmerged path crypto/authencesn.c

0 commit comments

Comments
 (0)