Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/815529/?format=api
{ "id": 815529, "url": "http://patchwork.ozlabs.org/api/patches/815529/?format=api", "web_url": "http://patchwork.ozlabs.org/project/linuxppc-dev/patch/0ef5b121c6d362b20d30c8eb37739287a2ee4905.1505825623.git.christophe.leroy@c-s.fr/", "project": { "id": 2, "url": "http://patchwork.ozlabs.org/api/projects/2/?format=api", "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": "<0ef5b121c6d362b20d30c8eb37739287a2ee4905.1505825623.git.christophe.leroy@c-s.fr>", "list_archive_url": "https://lore.kernel.org/linuxppc-dev/0ef5b121c6d362b20d30c8eb37739287a2ee4905.1505825623.git.christophe.leroy@c-s.fr/", "date": "2017-09-19T12:59:09", "name": "[5/6] crypto: talitos - use kzalloc instead of kmalloc", "commit_ref": null, "pull_url": null, "state": "not-applicable", "archived": false, "hash": "2d6640f87fed7d87b6f2397c37e5813838794369", "submitter": { "id": 5234, "url": "http://patchwork.ozlabs.org/api/people/5234/?format=api", "name": "Christophe Leroy", "email": "christophe.leroy@c-s.fr" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/linuxppc-dev/patch/0ef5b121c6d362b20d30c8eb37739287a2ee4905.1505825623.git.christophe.leroy@c-s.fr/mbox/", "series": [ { "id": 3874, "url": "http://patchwork.ozlabs.org/api/series/3874/?format=api", "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/815529/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/815529/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org>", "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 [IPv6:2401:3900:2:1::3])\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 3xxNTc4ZGFz9s4s\n\tfor <patchwork-incoming@ozlabs.org>;\n\tTue, 19 Sep 2017 23:08:04 +1000 (AEST)", "from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 3xxNTc3dwPzDrWm\n\tfor <patchwork-incoming@ozlabs.org>;\n\tTue, 19 Sep 2017 23:08:04 +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 3xxNHP1MNSzDqYK\n\tfor <linuxppc-dev@lists.ozlabs.org>;\n\tTue, 19 Sep 2017 22:59:13 +1000 (AEST)", "from localhost (mailhub1-int [192.168.12.234])\n\tby localhost (Postfix) with ESMTP id 3xxNH93x4Zz9ttBs;\n\tTue, 19 Sep 2017 14:59:01 +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 z5PCugqr1l_m; Tue, 19 Sep 2017 14:59:01 +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 3xxNH93PWQz9ttBd;\n\tTue, 19 Sep 2017 14:59:01 +0200 (CEST)", "from localhost (localhost [127.0.0.1])\n\tby messagerie.si.c-s.fr (Postfix) with ESMTP id DEBD98B827;\n\tTue, 19 Sep 2017 14:59:09 +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 eKnfKu9diB4t; Tue, 19 Sep 2017 14:59:09 +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 AC8098B810;\n\tTue, 19 Sep 2017 14:59:09 +0200 (CEST)", "by po15668-vm-win7.idsi0.si.c-s.fr (Postfix, from userid 0)\n\tid 9753E689A5; Tue, 19 Sep 2017 14:59:09 +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=<UNKNOWN>)", "X-Virus-Scanned": [ "Debian amavisd-new at c-s.fr", "amavisd-new at c-s.fr" ], "Message-Id": "<0ef5b121c6d362b20d30c8eb37739287a2ee4905.1505825623.git.christophe.leroy@c-s.fr>", "In-Reply-To": "<cover.1505825623.git.christophe.leroy@c-s.fr>", "References": "<cover.1505825623.git.christophe.leroy@c-s.fr>", "From": "Christophe Leroy <christophe.leroy@c-s.fr>", "Subject": "[PATCH 5/6] crypto: talitos - use kzalloc instead of kmalloc", "To": "Herbert Xu <herbert@gondor.apana.org.au>,\n\tDavid S. Miller <davem@davemloft.net>", "Date": "Tue, 19 Sep 2017 14:59:09 +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<linuxppc-dev.lists.ozlabs.org>", "List-Unsubscribe": "<https://lists.ozlabs.org/options/linuxppc-dev>,\n\t<mailto:linuxppc-dev-request@lists.ozlabs.org?subject=unsubscribe>", "List-Archive": "<http://lists.ozlabs.org/pipermail/linuxppc-dev/>", "List-Post": "<mailto:linuxppc-dev@lists.ozlabs.org>", "List-Help": "<mailto:linuxppc-dev-request@lists.ozlabs.org?subject=help>", "List-Subscribe": "<https://lists.ozlabs.org/listinfo/linuxppc-dev>,\n\t<mailto:linuxppc-dev-request@lists.ozlabs.org?subject=subscribe>", "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<linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org>" }, "content": "Use kzalloc() to zeroize the extended descriptor at allocation and\nfurther zeorising\n\nSigned-off-by: Christophe Leroy <christophe.leroy@c-s.fr>\n---\n drivers/crypto/talitos.c | 23 +----------------------\n drivers/crypto/talitos.h | 2 --\n 2 files changed, 1 insertion(+), 24 deletions(-)", "diff": "diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos.c\nindex cd8a37e60259..a5b608b54c74 100644\n--- a/drivers/crypto/talitos.c\n+++ b/drivers/crypto/talitos.c\n@@ -75,7 +75,6 @@ static void to_talitos_ptr_len(struct talitos_ptr *ptr, unsigned int len,\n \t\t\t bool is_sec1)\n {\n \tif (is_sec1) {\n-\t\tptr->res = 0;\n \t\tptr->len1 = cpu_to_be16(len);\n \t} else {\n \t\tptr->len = cpu_to_be16(len);\n@@ -118,7 +117,6 @@ static void map_single_talitos_ptr(struct device *dev,\n \n \tto_talitos_ptr_len(ptr, len, is_sec1);\n \tto_talitos_ptr(ptr, dma_addr, is_sec1);\n-\tto_talitos_ptr_ext_set(ptr, 0, is_sec1);\n }\n \n /*\n@@ -287,7 +285,6 @@ int talitos_submit(struct device *dev, int ch, struct talitos_desc *desc,\n \t/* map descriptor and save caller data */\n \tif (is_sec1) {\n \t\tdesc->hdr1 = desc->hdr;\n-\t\tdesc->next_desc = 0;\n \t\trequest->dma_desc = dma_map_single(dev, &desc->hdr1,\n \t\t\t\t\t\t TALITOS_DESC_SIZE,\n \t\t\t\t\t\t DMA_BIDIRECTIONAL);\n@@ -1099,7 +1096,6 @@ static int sg_to_link_tbl_offset(struct scatterlist *sg, int sg_count,\n \t\tto_talitos_ptr(link_tbl_ptr + count,\n \t\t\t sg_dma_address(sg) + offset, 0);\n \t\tto_talitos_ptr_len(link_tbl_ptr + count, len, 0);\n-\t\tto_talitos_ptr_ext_set(link_tbl_ptr + count, 0, 0);\n \t\tcount++;\n \t\tcryptlen -= len;\n \t\toffset = 0;\n@@ -1125,7 +1121,6 @@ int talitos_sg_map(struct device *dev, struct scatterlist *src,\n \tbool is_sec1 = has_ftr_sec1(priv);\n \n \tto_talitos_ptr_len(ptr, len, is_sec1);\n-\tto_talitos_ptr_ext_set(ptr, 0, is_sec1);\n \n \tif (sg_count == 1) {\n \t\tto_talitos_ptr(ptr, sg_dma_address(src) + offset, is_sec1);\n@@ -1197,11 +1192,9 @@ static int ipsec_esp(struct talitos_edesc *edesc, struct aead_request *areq,\n \tif (desc->hdr & DESC_HDR_TYPE_IPSEC_ESP) {\n \t\tto_talitos_ptr(&desc->ptr[2], edesc->iv_dma, is_sec1);\n \t\tto_talitos_ptr_len(&desc->ptr[2], ivsize, is_sec1);\n-\t\tto_talitos_ptr_ext_set(&desc->ptr[2], 0, is_sec1);\n \t} else {\n \t\tto_talitos_ptr(&desc->ptr[3], edesc->iv_dma, is_sec1);\n \t\tto_talitos_ptr_len(&desc->ptr[3], ivsize, is_sec1);\n-\t\tto_talitos_ptr_ext_set(&desc->ptr[3], 0, is_sec1);\n \t}\n \n \t/* cipher key */\n@@ -1221,7 +1214,6 @@ static int ipsec_esp(struct talitos_edesc *edesc, struct aead_request *areq,\n \t * typically 12 for ipsec\n \t */\n \tto_talitos_ptr_len(&desc->ptr[4], cryptlen, is_sec1);\n-\tto_talitos_ptr_ext_set(&desc->ptr[4], 0, is_sec1);\n \n \tsg_link_tbl_len = cryptlen;\n \n@@ -1275,8 +1267,6 @@ static int ipsec_esp(struct talitos_edesc *edesc, struct aead_request *areq,\n \t\t\tto_talitos_ptr(tbl_ptr, edesc->dma_link_tbl + offset,\n \t\t\t\t is_sec1);\n \t\t}\n-\t} else {\n-\t\tedesc->icv_ool = false;\n \t}\n \n \t/* ICV data */\n@@ -1386,7 +1376,7 @@ static struct talitos_edesc *talitos_edesc_alloc(struct device *dev,\n \t\talloc_len += icv_stashing ? authsize : 0;\n \t}\n \n-\tedesc = kmalloc(alloc_len, GFP_DMA | flags);\n+\tedesc = kzalloc(alloc_len, GFP_DMA | flags);\n \tif (!edesc) {\n \t\tdev_err(dev, \"could not allocate edescriptor\\n\");\n \t\terr = ERR_PTR(-ENOMEM);\n@@ -1467,7 +1457,6 @@ static int aead_decrypt(struct aead_request *req)\n \t\t\t\t DESC_HDR_MODE1_MDEU_CICV;\n \n \t\t/* reset integrity check result bits */\n-\t\tedesc->desc.hdr_lo = 0;\n \n \t\treturn ipsec_esp(edesc, req, ipsec_esp_decrypt_hwauth_done);\n \t}\n@@ -1554,12 +1543,10 @@ static int common_nonsnoop(struct talitos_edesc *edesc,\n \tbool is_sec1 = has_ftr_sec1(priv);\n \n \t/* first DWORD empty */\n-\tdesc->ptr[0] = zero_entry;\n \n \t/* cipher iv */\n \tto_talitos_ptr(&desc->ptr[1], edesc->iv_dma, is_sec1);\n \tto_talitos_ptr_len(&desc->ptr[1], ivsize, is_sec1);\n-\tto_talitos_ptr_ext_set(&desc->ptr[1], 0, is_sec1);\n \n \t/* cipher key */\n \tmap_single_talitos_ptr(dev, &desc->ptr[2], ctx->keylen,\n@@ -1598,7 +1585,6 @@ static int common_nonsnoop(struct talitos_edesc *edesc,\n \t\t\t DMA_FROM_DEVICE);\n \n \t/* last DWORD empty */\n-\tdesc->ptr[6] = zero_entry;\n \n \tif (sync_needed)\n \t\tdma_sync_single_for_device(dev, edesc->dma_link_tbl,\n@@ -1744,7 +1730,6 @@ static int common_nonsnoop_hash(struct talitos_edesc *edesc,\n \tint sg_count;\n \n \t/* first DWORD empty */\n-\tdesc->ptr[0] = zero_entry;\n \n \t/* hash context in */\n \tif (!req_ctx->first || req_ctx->swinit) {\n@@ -1753,8 +1738,6 @@ static int common_nonsnoop_hash(struct talitos_edesc *edesc,\n \t\t\t\t (char *)req_ctx->hw_context,\n \t\t\t\t DMA_TO_DEVICE);\n \t\treq_ctx->swinit = 0;\n-\t} else {\n-\t\tdesc->ptr[1] = zero_entry;\n \t}\n \t/* Indicate next op is not the first. */\n \treq_ctx->first = 0;\n@@ -1763,8 +1746,6 @@ static int common_nonsnoop_hash(struct talitos_edesc *edesc,\n \tif (ctx->keylen)\n \t\tmap_single_talitos_ptr(dev, &desc->ptr[2], ctx->keylen,\n \t\t\t\t (char *)&ctx->key, DMA_TO_DEVICE);\n-\telse\n-\t\tdesc->ptr[2] = zero_entry;\n \n \tsg_count = edesc->src_nents ?: 1;\n \tif (is_sec1 && sg_count > 1)\n@@ -1781,7 +1762,6 @@ static int common_nonsnoop_hash(struct talitos_edesc *edesc,\n \t\tsync_needed = true;\n \n \t/* fifth DWORD empty */\n-\tdesc->ptr[4] = zero_entry;\n \n \t/* hash/HMAC out -or- hash context out */\n \tif (req_ctx->last)\n@@ -1794,7 +1774,6 @@ static int common_nonsnoop_hash(struct talitos_edesc *edesc,\n \t\t\t\t req_ctx->hw_context, DMA_FROM_DEVICE);\n \n \t/* last DWORD empty */\n-\tdesc->ptr[6] = zero_entry;\n \n \tif (is_sec1 && from_talitos_ptr_len(&desc->ptr[3], true) == 0)\n \t\ttalitos_handle_buggy_hash(ctx, edesc, &desc->ptr[3]);\ndiff --git a/drivers/crypto/talitos.h b/drivers/crypto/talitos.h\nindex 8dd8f40e2771..6112ff1fc334 100644\n--- a/drivers/crypto/talitos.h\n+++ b/drivers/crypto/talitos.h\n@@ -52,8 +52,6 @@ struct talitos_ptr {\n \t__be32 ptr; /* address */\n };\n \n-static const struct talitos_ptr zero_entry;\n-\n /* descriptor */\n struct talitos_desc {\n \t__be32 hdr; /* header high bits */\n", "prefixes": [ "5/6" ] }