Message ID | 1486728445-13047-11-git-send-email-horia.geanta@nxp.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 3B167601EA for <patchwork-linux-crypto@patchwork.kernel.org>; Fri, 10 Feb 2017 12:08:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 273F728552 for <patchwork-linux-crypto@patchwork.kernel.org>; Fri, 10 Feb 2017 12:08:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1C32628564; Fri, 10 Feb 2017 12:08:16 +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,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 8AAD928552 for <patchwork-linux-crypto@patchwork.kernel.org>; Fri, 10 Feb 2017 12:08:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752588AbdBJMIL (ORCPT <rfc822;patchwork-linux-crypto@patchwork.kernel.org>); Fri, 10 Feb 2017 07:08:11 -0500 Received: from mail-by2nam03on0078.outbound.protection.outlook.com ([104.47.42.78]:25302 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753357AbdBJMIC (ORCPT <rfc822;linux-crypto@vger.kernel.org>); Fri, 10 Feb 2017 07:08:02 -0500 Received: from BN6PR03CA0008.namprd03.prod.outlook.com (10.168.230.146) by BN6PR03MB2945.namprd03.prod.outlook.com (10.175.126.11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.888.16; Fri, 10 Feb 2017 12:07:56 +0000 Received: from BY2FFO11FD020.protection.gbl (2a01:111:f400:7c0c::111) by BN6PR03CA0008.outlook.office365.com (2603:10b6:404:23::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.888.16 via Frontend Transport; Fri, 10 Feb 2017 12:07:56 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=nxp.com; vger.kernel.org; dkim=none (message not signed) header.d=none; vger.kernel.org; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.158.2 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Received: from az84smr01.freescale.net (192.88.158.2) by BY2FFO11FD020.mail.protection.outlook.com (10.1.14.137) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.888.7 via Frontend Transport; Fri, 10 Feb 2017 12:07:55 +0000 Received: from enigma.ea.freescale.net (enigma.ea.freescale.net [10.171.77.120]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id v1AC7ZqX022809; Fri, 10 Feb 2017 05:07:53 -0700 From: =?UTF-8?q?Horia=20Geant=C4=83?= <horia.geanta@nxp.com> To: Herbert Xu <herbert@gondor.apana.org.au> CC: "David S. Miller" <davem@davemloft.net>, Dan Douglass <dan.douglass@nxp.com>, Tudor Ambarus <tudor-dan.ambarus@nxp.com>, "Cristian Stoica" <cristian.stoica@nxp.com>, <linux-crypto@vger.kernel.org> Subject: [PATCH 10/12] crypto: caam - fix error path for ctx_dma mapping failure Date: Fri, 10 Feb 2017 14:07:23 +0200 Message-ID: <1486728445-13047-11-git-send-email-horia.geanta@nxp.com> X-Mailer: git-send-email 2.4.4 In-Reply-To: <1486728445-13047-1-git-send-email-horia.geanta@nxp.com> References: <1486728445-13047-1-git-send-email-horia.geanta@nxp.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-EOPAttributedMessage: 0 X-Matching-Connectors: 131312020758248816; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.158.2; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(336005)(7916002)(39450400003)(39400400002)(39840400002)(39410400002)(39860400002)(39380400002)(39850400002)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(77096006)(23676002)(85426001)(105606002)(54906002)(8656002)(53936002)(2870700001)(106466001)(104016004)(33646002)(5820100001)(81156014)(81166006)(8676002)(8936002)(68736007)(5660300001)(50226002)(86362001)(575784001)(6666003)(2950100002)(6916009)(92566002)(50466002)(626004)(4326007)(97736004)(189998001)(305945005)(38730400002)(110136004)(69596002)(356003)(36756003)(47776003)(2906002)(50986999)(76176999); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR03MB2945; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD020; 1:Yp/33Eaj0nkIGyQUPzMArd9w2/+mdSr6/b/mGrTiiJudGIpD6zW1epN/mx1Ljqfk/VMLeudngdl8fb2FC6hea6j6jBOmhRAWn5khgl5omdYJx6eummGYBJNNQ/iKMjinHPBSfY9uEN6guZMJO+KPD2XdrrAMp2tY6sbEr527WwwKPtQMq8QF3G1mqhexA/I/pWXgV+oZVcbqpX1XZuQ3zcgg8oUYsf5XwW0LLkd2GrvlRPG9MyobpCj0y/CUFIx7yziv22rQgqBdyezeOUJFjSdZwmGECvBWjoW0FZjilYOslOXN9W2nEezXYCA/gX+w9e7x1WyiRYp3x6k8j5YeqeJjUWGWRzg6y+tc1XTD9DN9R415gEUM1MWT/RfuhADVaDyJlzYLmUxsHArvy0jEEtQIPGup4RZ/RXMaJ9h1yX/rDu1A0OkMYA737Cv6DP/Fi2yYWGBRjU3vCsH+O9u0VLyLMvLMSHCi6CjSc6qoyYCDYRJ81YJUVOCSKXa7EWGS4gW/y+brxwEJdJM08cF3k6fOPtDS4Jup1zeqFlVzIWnysDZrlYDMz5NrNhSUToM8oBX9Uw37EN2AHKp3q8pXIPWF2mBDZfgBiA8YxFp5WOw= X-MS-Office365-Filtering-Correlation-Id: 8abd6e83-f9c8-4020-b260-08d451ad726c X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:BN6PR03MB2945; X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2945; 3:Mlr3oseXt3juIRuthPoQ425twm5blgoax6UmO6/7L46AFgh4hpzgyVu6XZfZq0/S3rcpyr0ehicFTMpgLxKW82CXEiYqi2x511S87hLL/COG8rf6R7LmIeydCh5vwx9n6Lsz8NoZhFANi4bHt1qWg3vF4z7bYEZ9IC1Squ2gNll890MtkBw4QGS9TQQS5Xz60J6D8eMiYa7d2YkmAWPo4sUy+i8ciwrOCtEW5AClmVwpS9be4oUFoSYs70i+xC+VmC4mT71PmSMK7OTPTzotQs70uDf8oI1vxNP+35NV0YpOkmLmF8MsHuog7Bw4Wubv263GmcLixaQ8n4AysorkGjBRXyariHDADQDwA+ZqhB45zHUaO5q1si6xbNK+t4MC; 25:moPoboq/EGAtU29JRzWhyZKK6ONAW26mRJS/3xfB8dqE8eNMRMxj02RwrnbWg5N/gFP8BaqTEsyKMLyLCzx+NBYdqPJz7ziUbO/Bkkkdzt2DBy0IgfRXxyI1VZoOZmA6Lkdd6E9FTx8FXlsHgxbfHScFrps6U8F4smNTPqezD6JyvqUMFuPEFbIVqNFvjvlmf3dAYqps29OQVgpViK2arFBB8s56sI6MJGmLjdSYwWZxuJHDVKqSPpNW5trzGvuVGHBdaYGXSNeGk0GXOOZss/RZLPkk3ofJKO2Vwavi6BfWSyKmqKwZ63MikvTEPKDhe9YyX1qevp0QzVqHxp4utdcTpLK1mGwjSQKrM8CFbuuT3de6Vir12jXGgBJdRYowRyx6Jl5HKncvMkBVp9fx1X1TEm4jdJsFVIRKSDN0nVj5/pctYsxs+ur5/Tox4Vmj X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2945; 31:rXwNnqVHc1XVm7lpxc2bL5dKoHEVq36f2f+4wXbaUwn2c9hvMKLyb1eyndF4z4o5wTLx82IA+vFSS+5VU7t3BDOZLqRSHagtCpZ51CIDiscueATf6iuSXx4iwP6O/D8CJlWLxhg0wv5u3esyjT/HTA0kiSLI82ogpTSwut7/PXmtTo0G3mvftgd92gU8P90L9AUQe/UcLugMzQwrYj3Ky6TXHS28LXmpGFno5pcTBRXvFXfzFCMUss7+TpYSYRMD X-Microsoft-Antispam-PRVS: <BN6PR03MB2945EB43C7AD3D421030290798440@BN6PR03MB2945.namprd03.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095060)(601004)(2401047)(8121501046)(5005006)(13018025)(13024025)(13023025)(13017025)(13015025)(3002001)(10201501046)(6055026)(6096035)(20161123556025)(20161123565025)(20161123559025)(20161123561025)(20161123563025); SRVR:BN6PR03MB2945; BCL:0; PCL:0; RULEID:(400006); SRVR:BN6PR03MB2945; X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2945; 4:FhmsjR/rEvlpVlBsRGG7NuswVhzrczg01O4oiMbMCKFITGiUFLzphs0FgBjF742KNk+upoDlsDNqYOCleyyWDuMQvvUApfIfv9p2yklrmftbWq73RyNxVSDwbh6ltaShCVIiJGzkTC6Qq902X+tY6o3zsuQfktZFNVmU8pc/+k4Tcwr4zbfOOxidDpGeUU1kIDrxhxlotVAdlk0WzgzeSMl8SAAVXiReuG8zE8hpzP5sSdPP53hAnHjt9rElCwqEyJZ7QxrzPvne1gd2gR9a7ExBpsIPdIWZL8EagLXHM/bc4nryQf5xX6KaD8ZN1i9z8mxd8LLtQcodXe4iY8vDFx4KYrOQfEGhQ2flYVkXI7YcdrdeEiH8w/+FtIt4wjc9dTM4qLT3P9t1t8xvt8kpG8IBtbHGdp1qidXO7c2rZzQJFVJ8UaeA5Y8Jniy5yiqVicHL19jsEko/rIxbjZXuuzdKim4gG7zYE1KevWoTVltMX8K2j4aJRsa1XeXJms/OCJwPzXV/FIGvJ7Q1Pm3MjxFtY+XgOGQXucEGcrFSCzEfkrsBddwlImCaN6CgwGWjDV5zeCj/VGbJ00jPXHFjiPe3gwLdtUtqPTdHDisSQwWIoJDhqIYeyW7cQKi9Wqg4NrEFbhtSLxsuY94wJr31J15yeBzX9l7Iqogy4OL+hgqHIWKuDwuW7vNQ2qaJIitBcozCV2bG/OkFa7I8/KLki21izqxTIMD50asBGT0Ekpg= X-Forefront-PRVS: 0214EB3F68 X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtCTjZQUjAzTUIyOTQ1OzIzOkZZVUdiQ3lPTXRHSGdMTHRPMldsZ1ovMUlT?= =?utf-8?B?NEpqckozekJ4TGJndGx5bVdtN3FWNmd3SmhmYSsxdlFJY1hCLy9hQWRYL2hm?= =?utf-8?B?N2JHRXVqR2Z4cmNWd2oyQmxFQjduNkhYVE9sbERadTV5ZDUvQkZ6em9xZ1hk?= =?utf-8?B?ZmhkQlBoTkxRUVY2cWdyVHR2aW9EdGJrL1RMK2IwKy9LQlVXWU45ZGZSZWg2?= =?utf-8?B?aGpoWXQwQTRVaFZNWXltaVlZMmVCZGVzSXEzMEc4U2tRV2ZRb1o1VFE2UEs2?= =?utf-8?B?WjhMbmFtd2poOVJxQmZxTXJyd1o0V0o2V042T0QvdHA5VW5yQlp4bEt2UkFu?= =?utf-8?B?MkQ4WkNrdnQ0b3FxOTEvOGJQUlEzY3hCMGVCOVBLUFRMRnRGVFkvZEx0VFZq?= =?utf-8?B?RnBkcUFKWXF0UGduTWZuN0haQk9qT3FOSUtrOEg5dHEzUjRYTzBQU285cW4x?= =?utf-8?B?WFVmNVRnREowdGNOSVBsMjF5cnlTamdvRUc1M2l0UVV6akVKdmxIRE82Qk1w?= =?utf-8?B?eWZzdTJjYmRrallFVzZ5Tk5zeWlRbTZxdE16NGNGOERCczlQa0lpbHBTTUZI?= =?utf-8?B?K3RUelE3TVRhR2dRY3NacEViOERwdTlYemI3cmRNL1d3R1ZoOGdnSGhOa0pv?= =?utf-8?B?eERLbEZ0TlhORHh5Y2Q1TWRsOU9GTDQvUUpaSWR1WFltUkpmUHA3cXRwWlhI?= =?utf-8?B?Mm1lQ0R3ZWJRZWF4S2RaeGxlQlZicU5WeEtVT0VoTENHTThpbUltV281ZWNZ?= =?utf-8?B?UlAvQ3d4SXZCRnArYkZzL09rZmswVXpDZEorM1N3QTJ4VTd0UVl5cHp6QU1x?= =?utf-8?B?UVVrbFdzb29GdmlsN3RiTVZJc1h6S2F1OEFlaTJTcjNpNE9wYVhVeXU5NDVX?= =?utf-8?B?YUJmd3FJV29hS1cyYzJnNEVaMlhvTmZ2eVBmdlhoc3l6bUYwUWQ5akdxRVZT?= =?utf-8?B?Mmp5SlRMYjhLdGFFUFozbWk1U1JKNnVlaG9CRmNCK0UvbkFQQUpiZXJVQVZD?= =?utf-8?B?MGVvVElMTE83QUhyVndWNUNuZThRNlFVd1NTYlZKTklUdnBwd2tHM2h2SU80?= =?utf-8?B?ZHZsS0JCQm1xT2RsOGFJejNIUU95MTdKay9aVkpRdFFTT1ZNdzV1ZUErMmtQ?= =?utf-8?B?OThsU1MydFNweEdIYyttTkNyb3FRUzdod2RxOG5DVWFsTFY3cjJLRFFqM2hC?= =?utf-8?B?WjdPMUJmZ3M2YzM0RmsyaDhldmRzUUR3OUgwa0RoNVhqQ3lWdkpxc1lySE42?= =?utf-8?B?NnFkNmhZbkdjOHU0RnptOXplTmNnSGpndE01dzUwMG5tZWhyWkdEYTVXSUk2?= =?utf-8?B?NndFNkx0Qzk1MGI0Tm9aWXpYeFF0bTFqRkF0TlpmYXRoQXd1V3VIa05XbHRk?= =?utf-8?B?eGFsdWFHK0VSVHJINWJWUDhuRkFlVDhWMmgwa2dTMDMrN0UrVlMxelBJUWo5?= =?utf-8?B?UWhiTEZ2d2JHb0NBQ2tFQXZQVWpxNC9sU1BnbFVINVp5dmQza1YreUROK0tC?= =?utf-8?B?V3lpTjIxb1hBdmNadzBhNjh4ZjJSTzd3c0tXR3R5dVNUZ2lhRTZmZDhkRjB6?= =?utf-8?B?cmxjam1uY3RXWll5L1RPRlNEZDc3YTlad0JpUzZQWmtLMkdFUS9sRDBwWm85?= =?utf-8?B?RFkwT2J5Si9WZDdNYWZ3ZEJqWG50V1dvUlJzeG5vY1NHZmF2b2h6THBtOXhQ?= =?utf-8?B?aEVvZTk2RzFHcHBqR3d4VCtoV2JTT0lUamtzMi92MVhwUjJ4QUYzTE5ScXVn?= =?utf-8?B?NTB4OGlRWVRvb0w4NGdHY2NKWmZqL29TZzQ1dUZOT0x5QWpQaWxaL1Y3WGVZ?= =?utf-8?B?ZHdGcnd3K3RSc3JuYThsM0kvWWF6QTl2VUhTL2FHUy94dmc9PQ==?= X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2945; 6:NMdcpOw7/nCyvkps976grBtEa/JXkj65QaM2EPQh9nOo8hkGNHaaJslNuuMqJ27AykwnrarNGKzaLW+PnKPqJ67MunZsc3iTPJHpyhfLwqyDfGsoWKbq9tC8TB0tyPOaB1D4+m8C7j7zF/3RXpjM0nMk/9l2x9JzzR3Qbs4ADcEJS2ZoERimthmx5RLyooUKUouPg53RoKaenPtLc4zlW+h/sCNIyp5yGthJZCH9nFdDJFPy1Az5GA0ryk7aIeSlGYL1yHgXTisbW0OFWlh3szSVBsD0QADDDDVYOFwyp0RDdR3nhXxcDG/z6a2/a9NeffsUH2/kELmf5GW7jnCMbb19yScPgOKDCAGpLnnkGfpdjNHUbR4w5IEJDp1h/6088p/1zP0BkyFmBhlEsOvfPM3hD/v1/aa3tqwMhDstRQA=; 5:3Qg83Vft9GjKD3wEFTvsSXsKg8SCtNPum1AJRfXqRA/15pDYjupuXB7nh0q45DsOqEj1oo7TeFunhWTPhy08/FrymYeE3OWQBlDzIPTiJd8kyF0B1RfWG2H+wz3JZiFhx+s413Efv4UvqUG47YCgKMp93YKncQ/6IQsI6+ki9mqlzc+PDH6ULdRk3Ef5XEZI; 24:CjehTM8ZxORK9n9tTo6ZIKSa3IjdZtCNS2O+CRIFk8l7KuKVLO9S5hw7SAvqL6y/KuOt4OlzbU542QpH3Xjo05XTcDfR01s3hizHsHF1M3c= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2945; 7:4KdpMOzLQCpCMIUfyqCTQNvmhpgBRiFtL4qrD2J7XxNK0LWEJh2YRTJ+iF7B0+ON/LTcOEYaNFk/KRa3TBoRdcrPKjzvEsr6QYIybb2R50A+GY3XTm0JTXFf/fzuod5LfTeifMfJS95Om+PdunlSulVcNqhqeIPsOqKW7BzUIjVmjr4MlKPD2sBO9i/qttpDzcP7G96Zg+9b0TUjAe3AoLeJgRhhtSC6H9lP3vLzUUycvMxTnRGfErN3vjCutRw8BNaSz1SHKpEnNcFigBXpgakD6s2qtR0NEXL2ahdNneO7Vo8bPwpjUykYXsMoSQSweeUj7lJmPXlCKPupOZKGXCah/rTBAw1pygNjakbD4cdxbOlz3As9pffGoJl/wxeg6Qkvefl6x1p1Ksnpbz+CFnI3kxFg/5hbE06Jj0obOqt71GLuv0i88quivOt2L6cASYkN6sr8WqdZmdbiZGqomv7pl/n1FyjC+VD9imXtOHGKiqeuE0H0U1b1rPT4HSfOe9XHBWFB6AOTy/N71NT/BA== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Feb 2017 12:07:55.5908 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR03MB2945 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 |
diff --git a/drivers/crypto/caam/caamhash.c b/drivers/crypto/caam/caamhash.c index 2ad83a8dc0fe..6c6c005f417b 100644 --- a/drivers/crypto/caam/caamhash.c +++ b/drivers/crypto/caam/caamhash.c @@ -148,6 +148,7 @@ static inline int map_seq_out_ptr_ctx(u32 *desc, struct device *jrdev, ctx_len, DMA_FROM_DEVICE); if (dma_mapping_error(jrdev, state->ctx_dma)) { dev_err(jrdev, "unable to map ctx\n"); + state->ctx_dma = 0; return -ENOMEM; } @@ -208,6 +209,7 @@ static inline int ctx_map_to_sec4_sg(u32 *desc, struct device *jrdev, state->ctx_dma = dma_map_single(jrdev, state->caam_ctx, ctx_len, flag); if (dma_mapping_error(jrdev, state->ctx_dma)) { dev_err(jrdev, "unable to map ctx\n"); + state->ctx_dma = 0; return -ENOMEM; } @@ -482,8 +484,10 @@ static inline void ahash_unmap_ctx(struct device *dev, struct caam_hash_ctx *ctx = crypto_ahash_ctx(ahash); struct caam_hash_state *state = ahash_request_ctx(req); - if (state->ctx_dma) + if (state->ctx_dma) { dma_unmap_single(dev, state->ctx_dma, ctx->ctx_len, flag); + state->ctx_dma = 0; + } ahash_unmap(dev, edesc, req, dst_len); } @@ -1463,6 +1467,7 @@ static int ahash_init(struct ahash_request *req) state->finup = ahash_finup_first; state->final = ahash_final_no_ctx; + state->ctx_dma = 0; state->current_buf = 0; state->buf_dma = 0; state->buflen_0 = 0;
In case ctx_dma dma mapping fails, ahash_unmap_ctx() tries to dma unmap an invalid address: map_seq_out_ptr_ctx() / ctx_map_to_sec4_sg() -> goto unmap_ctx -> -> ahash_unmap_ctx() -> dma unmap ctx_dma There is also possible to reach ahash_unmap_ctx() with ctx_dma uninitialzed or to try to unmap the same address twice. Fix these by setting ctx_dma = 0 where needed: -initialize ctx_dma in ahash_init() -clear ctx_dma in case of mapping error (instead of holding the error code returned by the dma map function) -clear ctx_dma after each unmapping Fixes: 32686d34f8fb6 ("crypto: caam - ensure that we clean up after an error") Signed-off-by: Horia Geantă <horia.geanta@nxp.com> --- drivers/crypto/caam/caamhash.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)