From: alexander.levin@verizon.com
To: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"stable@vger.kernel.org" <stable@vger.kernel.org>
Cc: LEROY Christophe <christophe.leroy@c-s.fr>,
Herbert Xu <herbert@gondor.apana.org.au>,
alexander.levin@verizon.com
Subject: [PATCH AUTOSEL for 4.9 071/100] crypto: talitos - fix AEAD test failures
Date: Wed, 13 Dec 2017 01:57:40 +0000 [thread overview]
Message-ID: <20171213015722.6722-46-alexander.levin@verizon.com> (raw)
In-Reply-To: <20171213015722.6722-1-alexander.levin@verizon.com>
From: LEROY Christophe <christophe.leroy@c-s.fr>
[ Upstream commit ec8c7d14acc0a477429d3a6fade5dab72c996c82 ]
AEAD tests fail when destination SG list has more than 1 element.
[ 2.058752] alg: aead: Test 1 failed on encryption for authenc-hmac-sha1-cbc-aes-talitos
[ 2.066965] 00000000: 53 69 6e 67 6c 65 20 62 6c 6f 63 6b 20 6d 73 67
00000010: c0 43 ff 74 c0 43 ff e0 de 83 d1 20 de 84 8e 54
00000020: de 83 d7 c4
[ 2.082138] alg: aead: Test 1 failed on encryption for authenc-hmac-sha1-cbc-aes-talitos
[ 2.090435] 00000000: 53 69 6e 67 6c 65 20 62 6c 6f 63 6b 20 6d 73 67
00000010: de 84 ea 58 c0 93 1a 24 de 84 e8 59 de 84 f1 20
00000020: 00 00 00 00
[ 2.105721] alg: aead: Test 1 failed on encryption for authenc-hmac-sha1-cbc-3des-talitos
[ 2.114259] 00000000: 6f 54 20 6f 61 4d 79 6e 53 20 63 65 65 72 73 74
00000010: 54 20 6f 6f 4d 20 6e 61 20 79 65 53 72 63 74 65
00000020: 20 73 6f 54 20 6f 61 4d 79 6e 53 20 63 65 65 72
00000030: 73 74 54 20 6f 6f 4d 20 6e 61 20 79 65 53 72 63
00000040: 74 65 20 73 6f 54 20 6f 61 4d 79 6e 53 20 63 65
00000050: 65 72 73 74 54 20 6f 6f 4d 20 6e 61 20 79 65 53
00000060: 72 63 74 65 20 73 6f 54 20 6f 61 4d 79 6e 53 20
00000070: 63 65 65 72 73 74 54 20 6f 6f 4d 20 6e 61 0a 79
00000080: c0 50 f1 ac c0 50 f3 38 c0 50 f3 94 c0 50 f5 30
00000090: c0 99 74 3c
[ 2.166410] alg: aead: Test 1 failed on encryption for authenc-hmac-sha1-cbc-3des-talitos
[ 2.174794] 00000000: 6f 54 20 6f 61 4d 79 6e 53 20 63 65 65 72 73 74
00000010: 54 20 6f 6f 4d 20 6e 61 20 79 65 53 72 63 74 65
00000020: 20 73 6f 54 20 6f 61 4d 79 6e 53 20 63 65 65 72
00000030: 73 74 54 20 6f 6f 4d 20 6e 61 20 79 65 53 72 63
00000040: 74 65 20 73 6f 54 20 6f 61 4d 79 6e 53 20 63 65
00000050: 65 72 73 74 54 20 6f 6f 4d 20 6e 61 20 79 65 53
00000060: 72 63 74 65 20 73 6f 54 20 6f 61 4d 79 6e 53 20
00000070: 63 65 65 72 73 74 54 20 6f 6f 4d 20 6e 61 0a 79
00000080: c0 50 f1 ac c0 50 f3 38 c0 50 f3 94 c0 50 f5 30
00000090: c0 99 74 3c
[ 2.226486] alg: No test for authenc(hmac(sha224),cbc(aes)) (authenc-hmac-sha224-cbc-aes-talitos)
[ 2.236459] alg: No test for authenc(hmac(sha224),cbc(aes)) (authenc-hmac-sha224-cbc-aes-talitos)
[ 2.247196] alg: aead: Test 1 failed on encryption for authenc-hmac-sha224-cbc-3des-talitos
[ 2.255555] 00000000: 6f 54 20 6f 61 4d 79 6e 53 20 63 65 65 72 73 74
00000010: 54 20 6f 6f 4d 20 6e 61 20 79 65 53 72 63 74 65
00000020: 20 73 6f 54 20 6f 61 4d 79 6e 53 20 63 65 65 72
00000030: 73 74 54 20 6f 6f 4d 20 6e 61 20 79 65 53 72 63
00000040: 74 65 20 73 6f 54 20 6f 61 4d 79 6e 53 20 63 65
00000050: 65 72 73 74 54 20 6f 6f 4d 20 6e 61 20 79 65 53
00000060: 72 63 74 65 20 73 6f 54 20 6f 61 4d 79 6e 53 20
00000070: 63 65 65 72 73 74 54 20 6f 6f 4d 20 6e 61 0a 79
00000080: c0 50 f1 ac c0 50 f3 38 c0 50 f3 94 c0 50 f5 30
00000090: c0 99 74 3c c0 96 e5 b8
[ 2.309004] alg: aead: Test 1 failed on encryption for authenc-hmac-sha224-cbc-3des-talitos
[ 2.317562] 00000000: 6f 54 20 6f 61 4d 79 6e 53 20 63 65 65 72 73 74
00000010: 54 20 6f 6f 4d 20 6e 61 20 79 65 53 72 63 74 65
00000020: 20 73 6f 54 20 6f 61 4d 79 6e 53 20 63 65 65 72
00000030: 73 74 54 20 6f 6f 4d 20 6e 61 20 79 65 53 72 63
00000040: 74 65 20 73 6f 54 20 6f 61 4d 79 6e 53 20 63 65
00000050: 65 72 73 74 54 20 6f 6f 4d 20 6e 61 20 79 65 53
00000060: 72 63 74 65 20 73 6f 54 20 6f 61 4d 79 6e 53 20
00000070: 63 65 65 72 73 74 54 20 6f 6f 4d 20 6e 61 0a 79
00000080: c0 50 f1 ac c0 50 f3 38 c0 50 f3 94 c0 50 f5 30
00000090: c0 99 74 3c c0 96 e5 b8
[ 2.370710] alg: aead: Test 1 failed on encryption for authenc-hmac-sha256-cbc-aes-talitos
[ 2.379177] 00000000: 53 69 6e 67 6c 65 20 62 6c 6f 63 6b 20 6d 73 67
00000010: 54 20 6f 6f 4d 20 6e 61 20 79 65 53 72 63 74 65
00000020: 20 73 6f 54 20 6f 61 4d 79 6e 53 20 63 65 65 72
[ 2.397863] alg: aead: Test 1 failed on encryption for authenc-hmac-sha256-cbc-aes-talitos
[ 2.406134] 00000000: 53 69 6e 67 6c 65 20 62 6c 6f 63 6b 20 6d 73 67
00000010: 54 20 6f 6f 4d 20 6e 61 20 79 65 53 72 63 74 65
00000020: 20 73 6f 54 20 6f 61 4d 79 6e 53 20 63 65 65 72
[ 2.424789] alg: aead: Test 1 failed on encryption for authenc-hmac-sha256-cbc-3des-talitos
[ 2.433491] 00000000: 6f 54 20 6f 61 4d 79 6e 53 20 63 65 65 72 73 74
00000010: 54 20 6f 6f 4d 20 6e 61 20 79 65 53 72 63 74 65
00000020: 20 73 6f 54 20 6f 61 4d 79 6e 53 20 63 65 65 72
00000030: 73 74 54 20 6f 6f 4d 20 6e 61 20 79 65 53 72 63
00000040: 74 65 20 73 6f 54 20 6f 61 4d 79 6e 53 20 63 65
00000050: 65 72 73 74 54 20 6f 6f 4d 20 6e 61 20 79 65 53
00000060: 72 63 74 65 20 73 6f 54 20 6f 61 4d 79 6e 53 20
00000070: 63 65 65 72 73 74 54 20 6f 6f 4d 20 6e 61 0a 79
00000080: c0 50 f1 ac c0 50 f3 38 c0 50 f3 94 c0 50 f5 30
00000090: c0 99 74 3c c0 96 e5 b8 c0 96 e9 20 c0 00 3d dc
[ 2.488832] alg: aead: Test 1 failed on encryption for authenc-hmac-sha256-cbc-3des-talitos
[ 2.497387] 00000000: 6f 54 20 6f 61 4d 79 6e 53 20 63 65 65 72 73 74
00000010: 54 20 6f 6f 4d 20 6e 61 20 79 65 53 72 63 74 65
00000020: 20 73 6f 54 20 6f 61 4d 79 6e 53 20 63 65 65 72
00000030: 73 74 54 20 6f 6f 4d 20 6e 61 20 79 65 53 72 63
00000040: 74 65 20 73 6f 54 20 6f 61 4d 79 6e 53 20 63 65
00000050: 65 72 73 74 54 20 6f 6f 4d 20 6e 61 20 79 65 53
00000060: 72 63 74 65 20 73 6f 54 20 6f 61 4d 79 6e 53 20
00000070: 63 65 65 72 73 74 54 20 6f 6f 4d 20 6e 61 0a 79
00000080: c0 50 f1 ac c0 50 f3 38 c0 50 f3 94 c0 50 f5 30
00000090: c0 99 74 3c c0 96 e5 b8 c0 96 e9 20 c0 00 3d dc
This patch fixes that.
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
drivers/crypto/talitos.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos.c
index 2df4bca4fb7f..a546ce39e168 100644
--- a/drivers/crypto/talitos.c
+++ b/drivers/crypto/talitos.c
@@ -1232,12 +1232,11 @@ static int ipsec_esp(struct talitos_edesc *edesc, struct aead_request *areq,
sg_link_tbl_len += authsize;
}
- sg_count = talitos_sg_map(dev, areq->src, cryptlen, edesc,
- &desc->ptr[4], sg_count, areq->assoclen,
- tbl_off);
+ ret = talitos_sg_map(dev, areq->src, cryptlen, edesc, &desc->ptr[4],
+ sg_count, areq->assoclen, tbl_off);
- if (sg_count > 1) {
- tbl_off += sg_count;
+ if (ret > 1) {
+ tbl_off += ret;
sync_needed = true;
}
--
2.11.0
next prev parent reply other threads:[~2017-12-13 2:00 UTC|newest]
Thread overview: 75+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-13 1:57 [PATCH AUTOSEL for 4.9 026/100] r8152: fix the rx early size of RTL8153 alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 027/100] tipc: fix nametbl deadlock at tipc_nametbl_unsubscribe alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 029/100] pinctrl: st: add irq_request/release_resources callbacks alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 028/100] inet: frag: release spinlock before calling icmp_send() alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 034/100] ARM: dts: ti: fix PCI bus dtc warnings alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 032/100] KVM: x86: correct async page present tracepoint alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 033/100] KVM: VMX: Fix enable VPID conditions alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 030/100] scsi: lpfc: Fix PT2PT PRLI reject alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 031/100] kvm: vmx: Flush TLB when the APIC-access address changes alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 035/100] hwmon: (asus_atk0110) fix uninitialized data access alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 038/100] ASoC: STI: Fix reader substream pointer set alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 036/100] i2c: mux: pca954x: Add missing pca9546 definition to chip_desc alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 037/100] HID: xinmo: fix for out of range for THT 2P arcade controller alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 041/100] s390/qeth: no ETH header for outbound AF_IUCV alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 039/100] r8152: prevent the driver from transmitting packets with carrier off alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 040/100] s390/qeth: size calculation outbound buffers alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 045/100] infiniband: Fix alignment of mmap cookies to support VIPT caching alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 042/100] bna: avoid writing uninitialized data into hw registers alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 044/100] IB/core: Protect against self-requeue of a cq work item alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 043/100] i40iw: Receive netdev events post INET_NOTIFIER state alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 047/100] net: Do not allow negative values for busy_read and busy_poll sysctl interfaces alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 048/100] IB/rxe: double free on error alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 050/100] i40e: Do not enable NAPI on q_vectors that have no rings alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 046/100] nbd: set queue timeout properly alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 049/100] IB/rxe: increment msn only when completing a request alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 051/100] RDMA/iser: Fix possible mr leak on device removal event alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 053/100] netfilter: nfnl_cthelper: fix a race when walk the nf_ct_helper_hash table alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 052/100] irda: vlsi_ir: fix check for DMA mapping errors alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 057/100] net: ipconfig: fix ic_close_devs() use-after-free alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 055/100] ARM: dts: am335x-evmsk: adjust mmc2 param to allow suspend alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 056/100] cpufreq: Fix creation of symbolic links to policy directories alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 054/100] netfilter: nf_nat_snmp: Fix panic when snmp_trap_helper fails to register alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 060/100] virtio_balloon: prevent uninitialized variable use alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 058/100] KVM: pci-assign: do not map smm memory slot pages in vt-d page tables alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 059/100] virtio-balloon: use actual number of stats for stats queue buffers alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 061/100] isdn: kcapi: avoid uninitialized data alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 063/100] xhci: plat: Register shutdown for xhci_plat alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 065/100] Btrfs: fix an integer overflow check alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 064/100] netfilter: nfnetlink_queue: fix secctx memory leak alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 062/100] net: moxa: fix TX overrun " alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 067/100] cpuidle: powernv: Pass correct drv->cpumask for registration alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 069/100] backlight: pwm_bl: Fix overflow condition alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 068/100] bnxt_en: Fix NULL pointer dereference in reopen failure path alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 066/100] ARM: dma-mapping: disallow dma_get_sgtable() for non-kernel managed memory alexander.levin
2017-12-13 1:57 ` alexander.levin [this message]
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 072/100] crypto: talitos - fix memory corruption on SEC2 alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 070/100] crypto: talitos - fix ctr-aes-talitos alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 073/100] crypto: crypto4xx - increase context and scatter ring buffer elements alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 077/100] PCI: Avoid bus reset if bridge itself is broken alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 076/100] net: phy: at803x: Change error to EINVAL for invalid MAC alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 074/100] rtc: pl031: make interrupt optional alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 075/100] kvm, mm: account kvm related kmem slabs to kmemcg alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 079/100] scsi: mpt3sas: Fix IO error occurs on pulling out a drive from RAID1 volume created on two SATA drive alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 081/100] PM / OPP: Move error message to debug level alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 080/100] PCI: Create SR-IOV virtfn/physfn links before attaching driver alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 078/100] scsi: cxgb4i: fix Tx skb leak alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 084/100] IB/rxe: check for allocation failure on elem alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 085/100] PCI/AER: Report non-fatal errors only to the affected endpoint alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 082/100] igb: check memory allocation failure alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 083/100] ixgbe: fix use of uninitialized padding alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 088/100] ASoC: img-parallel-out: Add pm_runtime_get/put to set_fmt callback alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 087/100] percpu: don't forget to free the temporary struct pcpu_alloc_info alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 089/100] powerpc/xmon: Avoid tripping SMP hardlockup watchdog alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 086/100] tracing: Exclude 'generic fields' from histograms alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 092/100] scsi: lpfc: PLOGI failures during NPIV testing alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 093/100] vfio/pci: Virtualize Maximum Payload Size alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 091/100] scsi: lpfc: Fix secure firmware updates alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 090/100] fm10k: fix mis-ordered parameters in declaration for .ndo_set_vf_bw alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 094/100] fm10k: ensure we process SM mbx when processing VF mbx alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 097/100] clk: sunxi-ng: sun6i: Rename HDMI DDC clock to avoid name collision alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 096/100] staging: greybus: light: Release memory obtained by kasprintf alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 095/100] net: ipv6: send NS for DAD when link operationally up alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 100/100] cpuidle: fix broadcast control when broadcast can not be entered alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 098/100] tcp: fix under-evaluated ssthresh in TCP Vegas alexander.levin
2017-12-13 1:57 ` [PATCH AUTOSEL for 4.9 099/100] rtc: set the alarm to the next expiring timer alexander.levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171213015722.6722-46-alexander.levin@verizon.com \
--to=alexander.levin@verizon.com \
--cc=christophe.leroy@c-s.fr \
--cc=herbert@gondor.apana.org.au \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®