android_kernel_oneplus_msm8998/drivers/crypto/caam
Horia Geantă a3cda6a020 crypto: caam - fix concurrency issue in givencrypt descriptor
commit 48f89d2a2920166c35b1c0b69917dbb0390ebec7 upstream.

IV transfer from ofifo to class2 (set up at [29][30]) is not guaranteed
to be scheduled before the data transfer from ofifo to external memory
(set up at [38]:

[29] 10FA0004           ld: ind-nfifo (len=4) imm
[30] 81F00010               <nfifo_entry: ofifo->class2 type=msg len=16>
[31] 14820004           ld: ccb2-datasz len=4 offs=0 imm
[32] 00000010               data:0x00000010
[33] 8210010D    operation: cls1-op aes cbc init-final enc
[34] A8080B04         math: (seqin + math0)->vseqout len=4
[35] 28000010    seqfifold: skip len=16
[36] A8080A04         math: (seqin + math0)->vseqin len=4
[37] 2F1E0000    seqfifold: both msg1->2-last2-last1 len=vseqinsz
[38] 69300000   seqfifostr: msg len=vseqoutsz
[39] 5C20000C      seqstr: ccb2 ctx len=12 offs=0

If ofifo -> external memory transfer happens first, DECO will hang
(issuing a Watchdog Timeout error, if WDOG is enabled) waiting for
data availability in ofifo for the ofifo -> c2 ififo transfer.

Make sure IV transfer happens first by waiting for all CAAM internal
transfers to end before starting payload transfer.

New descriptor with jump command inserted at [37]:

[..]
[36] A8080A04         math: (seqin + math0)->vseqin len=4
[37] A1000401         jump: jsl1 all-match[!nfifopend] offset=[01] local->[38]
[38] 2F1E0000    seqfifold: both msg1->2-last2-last1 len=vseqinsz
[39] 69300000   seqfifostr: msg len=vseqoutsz
[40] 5C20000C      seqstr: ccb2 ctx len=12 offs=0

[Note: the issue is present in the descriptor from the very beginning
(cf. Fixes tag). However I've marked it v4.19+ since it's the oldest
maintained kernel that the patch applies clean against.]

Cc: <stable@vger.kernel.org> # v4.19+
Fixes: 1acebad3d8 ("crypto: caam - faster aead implementation")
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
[Horia: backport to v4.4, v4.9]
Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2019-10-17 13:40:56 -07:00
..
caamalg.c crypto: caam - fix concurrency issue in givencrypt descriptor 2019-10-17 13:40:56 -07:00
caamhash.c crypto: caam - fix signals handling 2017-07-21 07:44:59 +02:00
caamrng.c crypto: caam - Use the preferred style for memory allocations 2015-08-24 22:07:42 +08:00
compat.h crypto: caam - Enable and disable clocks on Freescale i.MX platforms 2015-08-10 23:18:56 +08:00
ctrl.c crypto: caam - fix endless loop when DECO acquire fails 2018-02-16 20:09:45 +01:00
ctrl.h
desc.h crypto: caam - Remove unused JUMP_TYPE_MASK definition 2015-09-21 22:00:40 +08:00
desc_constr.h crypto: caam - fix warning in APPEND_MATH_IMM_u64 2015-07-20 15:53:43 +08:00
error.c crypto: caam - don't emit ICV check failures to dmesg 2015-01-26 11:34:23 +11:00
error.h crypto: caam - Contain caam_jr_strstatus() ugliness 2014-05-08 21:58:06 +08:00
intern.h crypto: caam - Enable and disable clocks on Freescale i.MX platforms 2015-08-10 23:18:56 +08:00
jr.c crypto: caam - fix caam_jr_alloc() ret code 2016-06-01 12:15:49 -07:00
jr.h
Kconfig crypto: caam - add support for LS1021A 2015-08-18 10:30:39 +08:00
key_gen.c crypto: caam - fix signals handling 2017-07-21 07:44:59 +02:00
key_gen.h
Makefile
pdb.h
regs.h crypto: caam - add support for LS1021A 2015-08-18 10:30:39 +08:00
sg_sw_sec4.h crypto: caam - dma_map_sg can handle chained SG 2015-10-01 21:56:56 +08:00