{"id":815527,"url":"http://patchwork.ozlabs.org/api/patches/815527/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/f715a42e1a9ac3f3301d1b637c4cfdcf4ca8e744.1505825623.git.christophe.leroy@c-s.fr/","project":{"id":2,"url":"http://patchwork.ozlabs.org/api/projects/2/?format=json","name":"Linux PPC development","link_name":"linuxppc-dev","list_id":"linuxppc-dev.lists.ozlabs.org","list_email":"linuxppc-dev@lists.ozlabs.org","web_url":"https://github.com/linuxppc/wiki/wiki","scm_url":"https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git","webscm_url":"https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/","list_archive_url":"https://lore.kernel.org/linuxppc-dev/","list_archive_url_format":"https://lore.kernel.org/linuxppc-dev/{}/","commit_url_format":"https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/commit/?id={}"},"msgid":"","list_archive_url":"https://lore.kernel.org/linuxppc-dev/f715a42e1a9ac3f3301d1b637c4cfdcf4ca8e744.1505825623.git.christophe.leroy@c-s.fr/","date":"2017-09-19T12:59:07","name":"[4/6] crypto: talitos - fix AEAD test failures","commit_ref":null,"pull_url":null,"state":"not-applicable","archived":false,"hash":"1deedafdb13a90d01450856041e7669a077ed122","submitter":{"id":5234,"url":"http://patchwork.ozlabs.org/api/people/5234/?format=json","name":"Christophe Leroy","email":"christophe.leroy@c-s.fr"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/f715a42e1a9ac3f3301d1b637c4cfdcf4ca8e744.1505825623.git.christophe.leroy@c-s.fr/mbox/","series":[{"id":3874,"url":"http://patchwork.ozlabs.org/api/series/3874/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/list/?series=3874","date":"2017-09-19T12:58:59","name":"crypto: talitos - various fixes","version":1,"mbox":"http://patchwork.ozlabs.org/series/3874/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/815527/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/815527/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":["patchwork-incoming@ozlabs.org","linuxppc-dev@lists.ozlabs.org"],"Delivered-To":["patchwork-incoming@ozlabs.org","linuxppc-dev@lists.ozlabs.org"],"Received":["from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68])\n\t(using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xxNRq4jffz9s4s\n\tfor ;\n\tTue, 19 Sep 2017 23:06:31 +1000 (AEST)","from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 3xxNRq0N6TzDqYQ\n\tfor ;\n\tTue, 19 Sep 2017 23:06:31 +1000 (AEST)","from pegase1.c-s.fr (pegase1.c-s.fr [93.17.236.30])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby lists.ozlabs.org (Postfix) with ESMTPS id 3xxNHN0LR4zDqXn\n\tfor ;\n\tTue, 19 Sep 2017 22:59:11 +1000 (AEST)","from localhost (mailhub1-int [192.168.12.234])\n\tby localhost (Postfix) with ESMTP id 3xxNH768Nzz9ttBn;\n\tTue, 19 Sep 2017 14:58:59 +0200 (CEST)","from pegase1.c-s.fr ([192.168.12.234])\n\tby localhost (pegase1.c-s.fr [192.168.12.234]) (amavisd-new,\n\tport 10024)\n\twith ESMTP id IeK-tpbvt737; Tue, 19 Sep 2017 14:58:59 +0200 (CEST)","from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192])\n\tby pegase1.c-s.fr (Postfix) with ESMTP id 3xxNH73Zh9z9ttBd;\n\tTue, 19 Sep 2017 14:58:59 +0200 (CEST)","from localhost (localhost [127.0.0.1])\n\tby messagerie.si.c-s.fr (Postfix) with ESMTP id CBA798B829;\n\tTue, 19 Sep 2017 14:59:07 +0200 (CEST)","from messagerie.si.c-s.fr ([127.0.0.1])\n\tby localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new,\n\tport 10023)\n\twith ESMTP id J9187ApnGZXr; Tue, 19 Sep 2017 14:59:07 +0200 (CEST)","from po15668-vm-win7.idsi0.si.c-s.fr (po15451.idsi0.si.c-s.fr\n\t[172.25.231.1])\n\tby messagerie.si.c-s.fr (Postfix) with ESMTP id 9FE8D8B810;\n\tTue, 19 Sep 2017 14:59:07 +0200 (CEST)","by po15668-vm-win7.idsi0.si.c-s.fr (Postfix, from userid 0)\n\tid 8E479689A5; Tue, 19 Sep 2017 14:59:07 +0200 (CEST)"],"Authentication-Results":"ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=c-s.fr\n\t(client-ip=93.17.236.30; helo=pegase1.c-s.fr;\n\tenvelope-from=christophe.leroy@c-s.fr; receiver=)","X-Virus-Scanned":["Debian amavisd-new at c-s.fr","amavisd-new at c-s.fr"],"Message-Id":"","In-Reply-To":"","References":"","From":"Christophe Leroy ","Subject":"[PATCH 4/6] crypto: talitos - fix AEAD test failures","To":"Herbert Xu ,\n\tDavid S. Miller ","Date":"Tue, 19 Sep 2017 14:59:07 +0200 (CEST)","X-BeenThere":"linuxppc-dev@lists.ozlabs.org","X-Mailman-Version":"2.1.24","Precedence":"list","List-Id":"Linux on PowerPC Developers Mail List\n\t","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org,\n\tlinux-crypto@vger.kernel.org","Errors-To":"linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org","Sender":"\"Linuxppc-dev\"\n\t"},"content":"AEAD tests fail when destination SG list has more than 1 element.\n\n[ 2.058752] alg: aead: Test 1 failed on encryption for authenc-hmac-sha1-cbc-aes-talitos\n[ 2.066965] 00000000: 53 69 6e 67 6c 65 20 62 6c 6f 63 6b 20 6d 73 67\n00000010: c0 43 ff 74 c0 43 ff e0 de 83 d1 20 de 84 8e 54\n00000020: de 83 d7 c4\n[ 2.082138] alg: aead: Test 1 failed on encryption for authenc-hmac-sha1-cbc-aes-talitos\n[ 2.090435] 00000000: 53 69 6e 67 6c 65 20 62 6c 6f 63 6b 20 6d 73 67\n00000010: de 84 ea 58 c0 93 1a 24 de 84 e8 59 de 84 f1 20\n00000020: 00 00 00 00\n[ 2.105721] alg: aead: Test 1 failed on encryption for authenc-hmac-sha1-cbc-3des-talitos\n[ 2.114259] 00000000: 6f 54 20 6f 61 4d 79 6e 53 20 63 65 65 72 73 74\n00000010: 54 20 6f 6f 4d 20 6e 61 20 79 65 53 72 63 74 65\n00000020: 20 73 6f 54 20 6f 61 4d 79 6e 53 20 63 65 65 72\n00000030: 73 74 54 20 6f 6f 4d 20 6e 61 20 79 65 53 72 63\n00000040: 74 65 20 73 6f 54 20 6f 61 4d 79 6e 53 20 63 65\n00000050: 65 72 73 74 54 20 6f 6f 4d 20 6e 61 20 79 65 53\n00000060: 72 63 74 65 20 73 6f 54 20 6f 61 4d 79 6e 53 20\n00000070: 63 65 65 72 73 74 54 20 6f 6f 4d 20 6e 61 0a 79\n00000080: c0 50 f1 ac c0 50 f3 38 c0 50 f3 94 c0 50 f5 30\n00000090: c0 99 74 3c\n[ 2.166410] alg: aead: Test 1 failed on encryption for authenc-hmac-sha1-cbc-3des-talitos\n[ 2.174794] 00000000: 6f 54 20 6f 61 4d 79 6e 53 20 63 65 65 72 73 74\n00000010: 54 20 6f 6f 4d 20 6e 61 20 79 65 53 72 63 74 65\n00000020: 20 73 6f 54 20 6f 61 4d 79 6e 53 20 63 65 65 72\n00000030: 73 74 54 20 6f 6f 4d 20 6e 61 20 79 65 53 72 63\n00000040: 74 65 20 73 6f 54 20 6f 61 4d 79 6e 53 20 63 65\n00000050: 65 72 73 74 54 20 6f 6f 4d 20 6e 61 20 79 65 53\n00000060: 72 63 74 65 20 73 6f 54 20 6f 61 4d 79 6e 53 20\n00000070: 63 65 65 72 73 74 54 20 6f 6f 4d 20 6e 61 0a 79\n00000080: c0 50 f1 ac c0 50 f3 38 c0 50 f3 94 c0 50 f5 30\n00000090: c0 99 74 3c\n[ 2.226486] alg: No test for authenc(hmac(sha224),cbc(aes)) (authenc-hmac-sha224-cbc-aes-talitos)\n[ 2.236459] alg: No test for authenc(hmac(sha224),cbc(aes)) (authenc-hmac-sha224-cbc-aes-talitos)\n[ 2.247196] alg: aead: Test 1 failed on encryption for authenc-hmac-sha224-cbc-3des-talitos\n[ 2.255555] 00000000: 6f 54 20 6f 61 4d 79 6e 53 20 63 65 65 72 73 74\n00000010: 54 20 6f 6f 4d 20 6e 61 20 79 65 53 72 63 74 65\n00000020: 20 73 6f 54 20 6f 61 4d 79 6e 53 20 63 65 65 72\n00000030: 73 74 54 20 6f 6f 4d 20 6e 61 20 79 65 53 72 63\n00000040: 74 65 20 73 6f 54 20 6f 61 4d 79 6e 53 20 63 65\n00000050: 65 72 73 74 54 20 6f 6f 4d 20 6e 61 20 79 65 53\n00000060: 72 63 74 65 20 73 6f 54 20 6f 61 4d 79 6e 53 20\n00000070: 63 65 65 72 73 74 54 20 6f 6f 4d 20 6e 61 0a 79\n00000080: c0 50 f1 ac c0 50 f3 38 c0 50 f3 94 c0 50 f5 30\n00000090: c0 99 74 3c c0 96 e5 b8\n[ 2.309004] alg: aead: Test 1 failed on encryption for authenc-hmac-sha224-cbc-3des-talitos\n[ 2.317562] 00000000: 6f 54 20 6f 61 4d 79 6e 53 20 63 65 65 72 73 74\n00000010: 54 20 6f 6f 4d 20 6e 61 20 79 65 53 72 63 74 65\n00000020: 20 73 6f 54 20 6f 61 4d 79 6e 53 20 63 65 65 72\n00000030: 73 74 54 20 6f 6f 4d 20 6e 61 20 79 65 53 72 63\n00000040: 74 65 20 73 6f 54 20 6f 61 4d 79 6e 53 20 63 65\n00000050: 65 72 73 74 54 20 6f 6f 4d 20 6e 61 20 79 65 53\n00000060: 72 63 74 65 20 73 6f 54 20 6f 61 4d 79 6e 53 20\n00000070: 63 65 65 72 73 74 54 20 6f 6f 4d 20 6e 61 0a 79\n00000080: c0 50 f1 ac c0 50 f3 38 c0 50 f3 94 c0 50 f5 30\n00000090: c0 99 74 3c c0 96 e5 b8\n[ 2.370710] alg: aead: Test 1 failed on encryption for authenc-hmac-sha256-cbc-aes-talitos\n[ 2.379177] 00000000: 53 69 6e 67 6c 65 20 62 6c 6f 63 6b 20 6d 73 67\n00000010: 54 20 6f 6f 4d 20 6e 61 20 79 65 53 72 63 74 65\n00000020: 20 73 6f 54 20 6f 61 4d 79 6e 53 20 63 65 65 72\n[ 2.397863] alg: aead: Test 1 failed on encryption for authenc-hmac-sha256-cbc-aes-talitos\n[ 2.406134] 00000000: 53 69 6e 67 6c 65 20 62 6c 6f 63 6b 20 6d 73 67\n00000010: 54 20 6f 6f 4d 20 6e 61 20 79 65 53 72 63 74 65\n00000020: 20 73 6f 54 20 6f 61 4d 79 6e 53 20 63 65 65 72\n[ 2.424789] alg: aead: Test 1 failed on encryption for authenc-hmac-sha256-cbc-3des-talitos\n[ 2.433491] 00000000: 6f 54 20 6f 61 4d 79 6e 53 20 63 65 65 72 73 74\n00000010: 54 20 6f 6f 4d 20 6e 61 20 79 65 53 72 63 74 65\n00000020: 20 73 6f 54 20 6f 61 4d 79 6e 53 20 63 65 65 72\n00000030: 73 74 54 20 6f 6f 4d 20 6e 61 20 79 65 53 72 63\n00000040: 74 65 20 73 6f 54 20 6f 61 4d 79 6e 53 20 63 65\n00000050: 65 72 73 74 54 20 6f 6f 4d 20 6e 61 20 79 65 53\n00000060: 72 63 74 65 20 73 6f 54 20 6f 61 4d 79 6e 53 20\n00000070: 63 65 65 72 73 74 54 20 6f 6f 4d 20 6e 61 0a 79\n00000080: c0 50 f1 ac c0 50 f3 38 c0 50 f3 94 c0 50 f5 30\n00000090: c0 99 74 3c c0 96 e5 b8 c0 96 e9 20 c0 00 3d dc\n[ 2.488832] alg: aead: Test 1 failed on encryption for authenc-hmac-sha256-cbc-3des-talitos\n[ 2.497387] 00000000: 6f 54 20 6f 61 4d 79 6e 53 20 63 65 65 72 73 74\n00000010: 54 20 6f 6f 4d 20 6e 61 20 79 65 53 72 63 74 65\n00000020: 20 73 6f 54 20 6f 61 4d 79 6e 53 20 63 65 65 72\n00000030: 73 74 54 20 6f 6f 4d 20 6e 61 20 79 65 53 72 63\n00000040: 74 65 20 73 6f 54 20 6f 61 4d 79 6e 53 20 63 65\n00000050: 65 72 73 74 54 20 6f 6f 4d 20 6e 61 20 79 65 53\n00000060: 72 63 74 65 20 73 6f 54 20 6f 61 4d 79 6e 53 20\n00000070: 63 65 65 72 73 74 54 20 6f 6f 4d 20 6e 61 0a 79\n00000080: c0 50 f1 ac c0 50 f3 38 c0 50 f3 94 c0 50 f5 30\n00000090: c0 99 74 3c c0 96 e5 b8 c0 96 e9 20 c0 00 3d dc\n\nThis patch fixes that.\n\nSigned-off-by: Christophe Leroy \n---\n drivers/crypto/talitos.c | 9 ++++-----\n 1 file changed, 4 insertions(+), 5 deletions(-)","diff":"diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos.c\nindex dff88838dce7..cd8a37e60259 100644\n--- a/drivers/crypto/talitos.c\n+++ b/drivers/crypto/talitos.c\n@@ -1232,12 +1232,11 @@ static int ipsec_esp(struct talitos_edesc *edesc, struct aead_request *areq,\n \t\t\tsg_link_tbl_len += authsize;\n \t}\n \n-\tsg_count = talitos_sg_map(dev, areq->src, cryptlen, edesc,\n-\t\t\t\t &desc->ptr[4], sg_count, areq->assoclen,\n-\t\t\t\t tbl_off);\n+\tret = talitos_sg_map(dev, areq->src, cryptlen, edesc, &desc->ptr[4],\n+\t\t\t sg_count, areq->assoclen, tbl_off);\n \n-\tif (sg_count > 1) {\n-\t\ttbl_off += sg_count;\n+\tif (ret > 1) {\n+\t\ttbl_off += ret;\n \t\tsync_needed = true;\n \t}\n \n","prefixes":["4/6"]}