Message ID | 152044426211.9969.5499799691786404440.stgit@sosxen2.amd.com (mailing list archive) |
---|---|
State | Accepted |
Delegated to: | Herbert Xu |
Headers | show
Return-Path: <linux-crypto-owner@kernel.org> Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 95C83602BD for <patchwork-linux-crypto@patchwork.kernel.org>; Wed, 7 Mar 2018 17:37:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8476E28ADD for <patchwork-linux-crypto@patchwork.kernel.org>; Wed, 7 Mar 2018 17:37:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7924028B3E; Wed, 7 Mar 2018 17:37:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BDD4C28ADD for <patchwork-linux-crypto@patchwork.kernel.org>; Wed, 7 Mar 2018 17:37:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933698AbeCGRhx (ORCPT <rfc822;patchwork-linux-crypto@patchwork.kernel.org>); Wed, 7 Mar 2018 12:37:53 -0500 Received: from mail-bn3nam01on0063.outbound.protection.outlook.com ([104.47.33.63]:39389 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S933533AbeCGRhu (ORCPT <rfc822;linux-crypto@vger.kernel.org>); Wed, 7 Mar 2018 12:37:50 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector1-amd-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=Qe0ybHB8zmVDoJr98aYLjDH23LAoMbSIwIHZSJTbN1k=; b=ytDWMkh6pS80/15NXtN1PeIhdPzhNsXqHXYjnunFtgnvt2stDyh7d+OoNJ1BAuGDgwFU1HtD9uRu+g4zQiDP9woz5OFLIGGEA5wF0oWFJCQocn94amn1xtRPEWL3Xhhl8tZEHYLTZf7cM1bnvnosbGQpT0uokG72p2qe8AswwCU= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Gary.Hook@amd.com; Received: from sosxen2.amd.com (165.204.78.1) by BLUPR12MB0692.namprd12.prod.outlook.com (2a01:111:e400:5951::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.548.13; Wed, 7 Mar 2018 17:37:46 +0000 Subject: [PATCH] crypto/ccp - Fill the result buffer only on digest, finup, and final ops From: Gary R Hook <gary.hook@amd.com> To: linux-crypto@vger.kernel.org Cc: thomas.lendacky@amd.com, herbert@gondor.apana.org.au, davem@davemloft.net Date: Wed, 07 Mar 2018 11:37:42 -0600 Message-ID: <152044426211.9969.5499799691786404440.stgit@sosxen2.amd.com> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Originating-IP: [165.204.78.1] X-ClientProxiedBy: BL0PR0102CA0002.prod.exchangelabs.com (2603:10b6:207:18::15) To BLUPR12MB0692.namprd12.prod.outlook.com (2a01:111:e400:5951::14) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: e481be4c-c35f-4cbc-c1f8-08d5845223c5 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(2017052603328)(7153060)(7193020); SRVR:BLUPR12MB0692; X-Microsoft-Exchange-Diagnostics: 1; BLUPR12MB0692; 3:IFdzf5YNIViDdNg6iuDy7OYvFgKRHzXw9bZinVQeeHR3RqHzOYNPMxJcp/mhQKJO5K5j+EpRBcaSZhgGHSzHYZJnpy2kwZphiYHkFo7YwyBVSqbD6fMGzg1dzhfBS8PzoTV4jC2Z3EArjgfufCuOD4fU/Ws0eFd6KOO32UAY2+uSc+rV5HHfVyFsw0oz08anigkjEoBixFoGkTIYnhIfn2cGfWzhgR4w5/Cdz1Vknleq8vwVKWo1Y4o9gapB5Ous; 25:c5KrGx0UobXesBLWAe7wGWIf8nr5ZDUynqKLLSxOM/TLDXJtSf0qP8jfDPisPdd64s8Z9YpjAiMgk10cR/dO3YYXtw88k41ewLwA+4ntn2tX2eHHj8QMRiE+zpkUxfS/YHoLZAzSG2l77eD+zs86fGUpmhQY1HrdB0PnwQ0tx8Iua08PF0IcUu62EMpORxzcl+0QYLtrB05gI/bZXFRpqM9Wp6tW2eZyPAp0G6eWtlVafqyWtGlSipfKpk5YzE83iLKH7wGim2KXXdWiX2xrsfvUdeRrsiV9ZvFIZT1Lv6sZeLwWjyvISFVWteDDaAJvA0jvVMg+JtMal/alQtrzlg==; 31:VLROol4mZT9EtFGQNhSKZYM1cuZpA4J8Yqnjw4QcrOlcP8E674CobL3q/KlkN3oS/Xv5oAkRR8ERfPd7yP+HH36tiArfeVRUv7HjIx2D1SqI5oCxmwqEeiBu5XiOkfu4FJvUytg2uZLX4cipRrkvEJESmR6X+DRIRHY1ETWjKkJNkNG8xEXsXyCxAzfO+ecXowQmi+fmWqsP96Fp52wPC0YpEEd15y4WCjXvOBjbGXM= X-MS-TrafficTypeDiagnostic: BLUPR12MB0692: X-Microsoft-Exchange-Diagnostics: 1; BLUPR12MB0692; 20:z6lKTvdOQw6OizUPk54bF0wrlQBZEVJotU4SLFv6EDYP0ss31Y0sI3g/4mboKHQYBM1pqP5lI3gSyTXKDHfDqvUZdxSpFhCpgP5BIMyuQImxdHY31M2S/wMT3knSFptAoeSBnW95YmGEPIiIR/GtVe7Stys1Ku+LZ3osWuD5c1bV7Lqvf9HeeeAHFOwqJgSuifFAyjS8AfrccDdBpZ0hXTR1AJkH4ClnVls+lEYGVsEf2vXg2UegKP11zlRttWfW+mnA/QHXWzH+fYXroU+8p4jzjU4c5xqmg/pmQgDIRSk6iQXTkNqJILOZH4YaUt+9vGY88d1BJCfYdC78n2wwMbDz2oDvVF+aIyBfoJxwdRw4hQMJY1v9X4SQWBA2+0zyAj7Sgef2LQk2yP6UV/dF0UdKfAT5nWxD85GEco4N5t8xHoNxmMXM3k5gODM8V+n5OpG9m+GRclNRe9E4NBwSsN2C1KX9ZJYCBCBwrxfYljdY4gJjq/0wCJV6g1F2vqUa; 4:OG85KaPb92kau8r4HO3pHMwcVm5UeBV3gzgulpv/CaOqoANAOM5+VSJHydadRxbZUiVRnaTSIJTCiuZd2AvVzusnhaS4x6GRbHqW5v/sKUyaEJQH4uMb8P+MqlqzIEUx3BuQVJNWP0YJhalQCBqwVv6kN/Wn2t/DZz+TR7TYzJNVD5FItVLIJW41rTUSFksuNEP+F5sWEaeC9mgx7FgPnIv8AWedMcv+WzqtTVCnvUMPSG2uBZQwyg3xzTKGkfAZAOWfEIRndQz9ouMSi2frtidGVbej5NuTnvTIShvLkCcHTZiiJrCNE6g6j3p7rqi5yF89FJdsVKbM828Kibai7w== X-Microsoft-Antispam-PRVS: <BLUPR12MB0692E6D82D7F11E08943A58EFDD80@BLUPR12MB0692.namprd12.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:(9452136761055)(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040501)(2401047)(8121501046)(5005006)(3002001)(3231220)(944501244)(52105095)(93006095)(93001095)(10201501046)(6055026)(6041288)(20161123564045)(20161123560045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(6072148)(201708071742011); SRVR:BLUPR12MB0692; BCL:0; PCL:0; RULEID:; SRVR:BLUPR12MB0692; X-Forefront-PRVS: 0604AFA86B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39380400002)(366004)(396003)(346002)(376002)(39860400002)(18543002)(189003)(199004)(50466002)(316002)(58126008)(53936002)(55016002)(68736007)(8676002)(81156014)(81166006)(52116002)(7696005)(97736004)(8936002)(53416004)(47776003)(66066001)(230700001)(103116003)(2486003)(6116002)(305945005)(2351001)(16526019)(106356001)(7736002)(86362001)(575784001)(478600001)(72206003)(23676004)(2361001)(6666003)(6916009)(26005)(3846002)(25786009)(1857600001)(105586002)(59450400001)(386003)(2906002)(4326008)(5660300001); DIR:OUT; SFP:1101; SCL:1; SRVR:BLUPR12MB0692; H:sosxen2.amd.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtCTFVQUjEyTUIwNjkyOzIzOmNNRmlPOWtXYnFzaEZSZllpZHMzclNudHRU?= =?utf-8?B?UzFuMDg5R1AwMmpGV01FWDBzVEsvbWdRd05HYmVRMGlFUjdOTk81TFZTSHVM?= =?utf-8?B?T3JZeDNxejc5eFg3QXlOYnRodGJLYlZ3Z1BjYVZ6azN6WnB6NkJYaURMR29s?= =?utf-8?B?YytBYVpETFdKMGlyY05VMjRmS1AvczdHWG5BYko1bXZnRjhCYnRSQ083N2V6?= =?utf-8?B?d1hPSTdPdTk2Nko1Y3lERGVrdG1zdVozOVFzbXN0L2ZWSkFKSGlpck5iemRN?= =?utf-8?B?ZjFQMDNxR0JmNGFuZmM2R3R3OVlXVlVtNWk3Z0w1dUR5OUhuN21jQmh2M3lt?= =?utf-8?B?TnVjelFaUHlDZDIzSkVlTmV5SDZLQWMvYWZCalhiWTZjQVhFajFNTVF0SzVN?= =?utf-8?B?SFRTMGFIWkpocVVpK2VDUnBNV0Z6T0pSRkZoTU1BTCtESUc4RDB2bWtsU3ls?= =?utf-8?B?S2hlaWRmSlh1Vml6SytIVjgrdmdtdU1qRE9zNWdJMG90R3lFV2MvZnV6ZE5V?= =?utf-8?B?dVBZdVlSb255S1NHYnN6WFl5TWs2OU5YYXlqZVdLa0tlanR3VU5QRm9QeDMw?= =?utf-8?B?dWcwVXZyOWZ4K05welZyU0xqTlhwdDVMdERnS1dyMmd0Y1BzSXB4dVBNVDlQ?= =?utf-8?B?L2xrKy9QdCtjU25zQ2xuMzhoUENxZ2FZcUJMWDRXbWZrczJUT3RMK0UvV2RK?= =?utf-8?B?SysyRHFFaGNzdFcwRXVxeVFpQWhKMjdSUmJ1Tks3SEtKbkIwTzFmUEo3NFNu?= =?utf-8?B?cTBNMTRsK1pndm9wUFpnTm0wK2RWRjZtdkVzUFBGalBMbXcvNzhZVEkrdDZS?= =?utf-8?B?eWtDQm83MnBXNUFWMXBZMGpaSmcyUnlFSmRTUXhseEZOK0JzUnFPSnJVVHVi?= =?utf-8?B?bUVZNFlZSE9vbWl3ZjBBaDY4VUFYMWc0aEdxVDdGTnIwUGlITG11dnBwdklN?= =?utf-8?B?M0dkeWd1MkE2bHM1ZzNwVGxCV2NLYnd0d05TWEpUblJpRzN1K1RHTThKaTU4?= =?utf-8?B?bGJxbXZ2NWV4TnVxODVWQjVSRlRUWWlJYWhGR0tsbXJEZUNsNGpxdFlmM1JC?= =?utf-8?B?QjVMTXZrakQ5RXIzVjFrdlpNYlR6N0k5MUQvcW1GOW9MU3Z1bnQ1K1F2b00v?= =?utf-8?B?aHhZS0tqUGs3cHlMMUh0MTkyS1k0ckFMbG1oK3JuNGRZZW9zS1UzRzN3UXh2?= =?utf-8?B?aE1lNmtFaitDemcwRHd5WXY1QkdDT2J5bEJ6M2JOMjFQRWtaYkFpamlmcE56?= =?utf-8?B?WTg4cjIySFJZQ3JWZFVRaU93cVhFakdqenJjSVUxRGJ1bC9GMWljY0h0ZGpo?= =?utf-8?B?YmVVeDBHeHlvYTQ5SlpDMFhoVThRcHBjMUhaSzF1Q2U3U1dVY1VhdmdWZVJp?= =?utf-8?B?cUt3N3lJNFY1UVdaQTRCOENwNnVLbW9VdDhyNjdxM28wazlZcmJaUFdHby9K?= =?utf-8?B?VlM5WndIeXptcitHemp0d1poVktSUWQ2ZVhyK1c0R3E5bmppblllS3hCeVZG?= =?utf-8?B?ZGdaUTVBNVEyZjhEN0hZS3IxYXQ4WGRvZWNqK2VSbTJ1OHFsL0pMeGhmb1NQ?= =?utf-8?B?aE1kbS9CSVpnc0Yza2VUcmNyWURyOGRkVHY4SUtiY1dNcFZPZHFpNE5rUGNE?= =?utf-8?Q?WyvJsOG8J2DL0K8CEuJX?= X-Microsoft-Antispam-Message-Info: FYvziAACc7Ecx0PU2VAgck3EUwrxKISks1imdYZfxHfIDcx7I/qvku/rrOSXOBuLeGe9ELr8dWu8mvbQQHzSUw9BzSiWDq2NcAHpDKPE96czhy1twfrFqgTsXoREI6vzXJT4KWSOkyykiNyzdRFKERC+u6gDuoRbb1c6JJt+ceAUclzlb/y2BOjf+Z3L0xp6 X-Microsoft-Exchange-Diagnostics: 1; BLUPR12MB0692; 6:j8o2gZrkugEIVZHy56m5nakP0ymzb6TbXX4IbuL8c2F8ZL1Wh3UawriUYlDhXFev/JPOoh6zYDPDYVxwqsw524yTPlf7TXbQcej1ZU3VhnE2BEwV45I9zmy0pcv8DCOy4gr0Pe+9YSRVvC0LG5+2ULO1KujxBtJ1t0xfNsNcOCV4sUPbP7yQKcHOqsO0RxgEYOnEBF/tqoDXr6YoeD1zQMhCb+E6Mw1Bc0GCX9a1L+gyv96Wn4rFqQF2coKYVhgsw9v3MmhBNM5TA+b4bipXCkYLHWrkXym2ugXv7nAdsHNcJejaWlIxM5FNhmn2NiB+Uy+nLFvRF/2XDb16Dpmjjt7t8Mbqy4yCyBCd//5TzoI=; 5:ti2TJW6UC9H4NN+40KmOYlGajHcATSWIUlnCWDUyz5kQUtL3ou4FB/SKu8Cz3EFqUVHko3JKgg82uNa0vR5qyZtb5CbwreVUjRJVp+uU7TEFB/sbiDK+vZX0W4BM/0wDvG5A5YVZ002HsQicIV71j3k+8jyQ6WoOVLZce6Fm+cs=; 24:Y4chIghr11Yaws0SrmeM3/41MvElnLxlmyh8T1xQQRnwwYxCcExTPww9nUyPYypNT/vxJ5dD0OtsKeH46dvseu3cF4XPEJOJzeXqA7rAvq4=; 7:EtD8C1XMJtwhOIYbPy2qL0VZJm0waK0tzbbhzNm5DdFDgKbkS6W0p9qDMRxIpw1D37iyBp0letfo7J8lNI8aoye4i7Bx5AON3xOdGkOU2EwwgWT2JWo+OU4xSe3ooD/D8js3f+zR+92XMqamCB6XpGVcdbeArk8jr2A1RpCN6zLl4sXfqFL7SNC3WEjYtEsYoCG/p6xwcqGRv0j7T/dnsb8oLeDU5av2k2M1TSdbCBnrL+90INCrGy/qpibG37rE SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BLUPR12MB0692; 20:plq41omWGUvaFh+z8TXD9IB1BsFfbSzclQ78def0UdifNoFk8T8eIFyxkNiY4QhRs4amjPUUYDxL0kd0yt/fntKpfopcnGs+xU/DHmW0Axw/K0rC5fUBDDJF+7ZqI3hzlmaWHyZt/TRNrZYJ7cpphuOWviXgYA4oDlGV7z0A5vU82WmKFTtGVif6b7g66V6vE8XvE7KDYLTR/bUrEZ4zO0hLSUsOjDhYIfhX3s10qnotMu2OdtOK+utzwRxAlBmk X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Mar 2018 17:37:46.1703 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e481be4c-c35f-4cbc-c1f8-08d5845223c5 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR12MB0692 Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: <linux-crypto.vger.kernel.org> X-Mailing-List: linux-crypto@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP |
On Wed, Mar 07, 2018 at 11:37:42AM -0600, Gary R Hook wrote: > Any change to the result buffer should only happen on final, finup > and digest operations. Changes to the buffer for update, import, export, > etc, are not allowed. > > Fixes: 66d7b9f6175e ("crypto: testmgr - test misuse of result in ahash") > Signed-off-by: Gary R Hook <gary.hook@amd.com> > Cc: <stable@vger.kernel.org> Patch applied. Thanks.
diff --git a/drivers/crypto/ccp/ccp-crypto-aes-cmac.c b/drivers/crypto/ccp/ccp-crypto-aes-cmac.c index 60fc0fa26fd3..26687f318de6 100644 --- a/drivers/crypto/ccp/ccp-crypto-aes-cmac.c +++ b/drivers/crypto/ccp/ccp-crypto-aes-cmac.c @@ -46,7 +46,7 @@ static int ccp_aes_cmac_complete(struct crypto_async_request *async_req, } /* Update result area if supplied */ - if (req->result) + if (req->result && rctx->final) memcpy(req->result, rctx->iv, digest_size); e_free: diff --git a/drivers/crypto/ccp/ccp-crypto-sha.c b/drivers/crypto/ccp/ccp-crypto-sha.c index 8b9b16d433f7..871c9628a2ee 100644 --- a/drivers/crypto/ccp/ccp-crypto-sha.c +++ b/drivers/crypto/ccp/ccp-crypto-sha.c @@ -47,7 +47,7 @@ static int ccp_sha_complete(struct crypto_async_request *async_req, int ret) } /* Update result area if supplied */ - if (req->result) + if (req->result && rctx->final) memcpy(req->result, rctx->ctx, digest_size); e_free:
Any change to the result buffer should only happen on final, finup and digest operations. Changes to the buffer for update, import, export, etc, are not allowed. Fixes: 66d7b9f6175e ("crypto: testmgr - test misuse of result in ahash") Signed-off-by: Gary R Hook <gary.hook@amd.com> Cc: <stable@vger.kernel.org> --- 0 files changed