From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0b-0002e601.pphosted.com (mx0b-0002e601.pphosted.com [148.163.154.28]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 964B244E042; Thu, 27 Aug 2026 13:24:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=148.163.154.28 ARC-Seal:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787837067; cv=fail; b=VyskYCQ/lxK3Q7NZ9C2AVFSUuPehsiTURZ7xbuxKj0EEg4g1FNTaGWA/OGqi0ibEbMamvYJpURBRBt8JcHDxT0Pc3vyK9f2S1PbDOaGPVhGEIekHS6NmJCNTHyd/AvdMnRg+newJQKyi4RLuHl/BDdiIgRx6Yx42Cc4sPQDZ5Ao= ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787837067; c=relaxed/simple; bh=0J97k2ADQjTt5VgClQMfdh7rNSuYWap7NJhSkJJtdXU=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=tD2P0Bj1vVVdx6KgiUa4w+MCe83E7Ql7dwlW7uiGbRfoYPI1WfxZf6z51/l59Djg66q48ifP12Bfbpvia5VpTOEmPwHIwK+NkrlE8CdMqwdEGtiIRMcPq0LJ3SQrswZS9QtZNXCY5EykRS4FQTgwIjQPw21xBvpFUbrme5BmT9E= ARC-Authentication-Results:i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=ti.com; spf=pass smtp.mailfrom=ti.com; dkim=pass (2048-bit key) header.d=ti.com header.i=@ti.com header.b=DAHCyTY+; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b=FPHtGfWS; arc=fail smtp.client-ip=148.163.154.28 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=ti.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ti.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ti.com header.i=@ti.com header.b="DAHCyTY+"; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b="FPHtGfWS" Received: from pps.filterd (m0374956.ppops.net [127.0.0.1]) by mx0b-0002e601.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 67RCAJeX2720318; Thu, 27 Aug 2026 08:24:08 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= proofpoint-05-2026; bh=FX86iHTm/S2ECjFY6m5onM9+szkF2YYLpzTCdbj5G Ds=; b=DAHCyTY+sEw5fl6e2yT7XdnI4FU8nQZy1xYbg54knvqwR3Y20ntPSyXAt 2Ohu9oQaMQ4HnVTxmULk47iRndp/B68Dyq3A/JbnIaIO1nyBpJ1vHzZBKkwyGwkv JA1DmvnnwMDyayZ3CfPw2KsxG1yqhbsKJJ7zSKx/cGYqvij9C/BJcVbJ+j7O4VHA XWf3d4xGjNguI8eAphYpBbqB/sWEXQY3Zx6HxOQetHOAHdKjzgQulwWaa30c/xWP +/lJrSXaD8c8iv3pRt9axGkISqnsxbDtYFmXk7PJ7zhkMqVgSvIOlJAxIHB7Otkc 6jKOMjcJFWLlGiaG6EEoPdAVowRVg== Received: from co1pr03cu002.outbound.protection.outlook.com (mail-westus2azon11010060.outbound.protection.outlook.com [52.101.46.60]) by mx0b-0002e601.pphosted.com (PPS) with ESMTPS id 4gakag0wd6-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Thu, 27 Aug 2026 08:24:08 -0500 (CDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=N/c6JaQUr/UtmrKcq3GwnvEFQ/3Rc2SvsHrrOuv5siDjBplCuuj2XEo8S8qajb65YpnZf46CO6ct0bPCXRfjrOMXQ66KllQbCIFMh1QB0bbXZvcjglgtOdWgJvRvS2v9fExzGqn2rXbmdvsfrNnwiA3ZVIKJXcHPywMuCW9W+4k/5hW7ESGOSiHcU4GJYLT0qFW7feS1gc9200oqOK5zAErcpqc6soVUCewrLccGt6Z1bXzXh4exdHkSd+izeClnwevp10LA83NUD6Bdu/rcXurfy6itekbBpyJyh1zydD/gmElArvS5M+p7nNQJs7/COvXx19tNxW6eBEYu3tKprQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=FX86iHTm/S2ECjFY6m5onM9+szkF2YYLpzTCdbj5GDs=; b=twpgsb6CDp9pccuAppdyef3xt3sjJnEKBzX5GUbytajh7OJWlxMZamJ/oVvNwoQG29XGY1D7R7AQOhE5LQZ/0h0siR69Mj5T9sLmWfgZSYrVloxTpVQr0oUXgsUxL3N2kwAfg0YdjmlxOph0ehiegehlGjAlz+QaSNHD+pKYuU7vdCV1FgazQd+QXs3haQYDcNtO+m1R6zLnca4glh9Kegg+MQOGOo80PBgJjqHm0arP/Zvwv720K/1dvOLW4VTNdL3aPg/t+GhINbyd6BcACY5PmkjdmPlb9vYwgdrkzW862PbW4cUSGKgFxWr70/mp2tTHZ5W9pFc7gDNcNqC6cQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 198.47.23.194) smtp.rcpttodomain=gondor.apana.org.au smtp.mailfrom=ti.com; dmarc=pass (p=quarantine sp=none pct=100) action=none header.from=ti.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=FX86iHTm/S2ECjFY6m5onM9+szkF2YYLpzTCdbj5GDs=; b=FPHtGfWSEiTxBc6HJmi04gUk1sE5OXSmB4feBJ/8pqtS5GoaRM4XbOKTHljm+4ZgSbvzXa7RMhUvulPRqX2NZay6HhS+MAn9gX08XE188px/tMReyKXm47Z3KnyD8+Mx9Mlre9434cYONDwehUbskPrDClpS4wsE4/KlcJxXCIA= Received: from MW4PR04CA0267.namprd04.prod.outlook.com (2603:10b6:303:88::32) by DS0PR10MB997675.namprd10.prod.outlook.com (2603:10b6:8:311::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.382.5; Thu, 27 Aug 2026 13:24:03 +0000 Received: from SJ5PEPF000001D3.namprd05.prod.outlook.com (2603:10b6:303:88:cafe::70) by MW4PR04CA0267.outlook.office365.com (2603:10b6:303:88::32) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.360.10 via Frontend Transport; Thu, 27 Aug 2026 13:24:03 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 198.47.23.194) smtp.mailfrom=ti.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=ti.com; Received-SPF: Pass (protection.outlook.com: domain of ti.com designates 198.47.23.194 as permitted sender) receiver=protection.outlook.com; client-ip=198.47.23.194; helo=lewvzet200.ext.ti.com; pr=C Received: from lewvzet200.ext.ti.com (198.47.23.194) by SJ5PEPF000001D3.mail.protection.outlook.com (10.167.242.55) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.360.3 via Frontend Transport; Thu, 27 Aug 2026 13:24:02 +0000 Received: from DLEE201.ent.ti.com (157.170.170.76) by lewvzet200.ext.ti.com (10.4.14.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45; Thu, 27 Aug 2026 08:23:41 -0500 Received: from DLEE205.ent.ti.com (157.170.170.85) by DLEE201.ent.ti.com (157.170.170.76) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45; Thu, 27 Aug 2026 08:23:41 -0500 Received: from lelvem-mr05.itg.ti.com (10.180.75.9) by DLEE205.ent.ti.com (157.170.170.85) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45 via Frontend Transport; Thu, 27 Aug 2026 08:23:41 -0500 Received: from pratham-Workstation-PC (pratham-workstation-pc.dhcp.ti.com [10.24.53.205]) by lelvem-mr05.itg.ti.com (8.18.1/8.18.1) with ESMTP id 67RDNeR31930988; Thu, 27 Aug 2026 08:23:41 -0500 From: T Pratham To: T Pratham , Herbert Xu , "David S. Miller" CC: Sebin Francis , Manorit Chawdhry , Vishal Mahaveer , Praneeth Bajjuri , Kamlesh Gurudasani , , Subject: [PATCH v2 4/7] crypto: ti - Trim scatterlists to correct length in AES Date: Thu, 27 Aug 2026 18:53:15 +0530 Message-ID: <20260827132318.613876-5-t-pratham@ti.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260827132318.613876-1-t-pratham@ti.com> References: <20260827132318.613876-1-t-pratham@ti.com> Precedence: bulk X-Mailing-List: linux-crypto@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ5PEPF000001D3:EE_|DS0PR10MB997675:EE_ X-MS-Office365-Filtering-Correlation-Id: 5eabca15-abc7-4769-bc61-08df043e765f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|36860700016|1800799024|82310400026|23010399003|10067099003|56012099006|6133799003|22082099003|18002099003; X-Microsoft-Antispam-Message-Info: Kt9e6ftIsqfvriCk171pVKSuXTRSXCxBeJy8kfn2sO0Hd0yrSmDIChiuPgt4mPGbUod5soA7FmWivochMEs+NRbCyWkC3KuHojkm23hGtfSU1UqaOIPk3WcdyGIb4VbYLVmr28jtBHnhHcyOWOoJ+AmvpXcA88gccldxi8YBBpfRCSQ2mRaCBTB5PvylLRJjVNAJlh5ErrWVhtxMweR6Ck3UTnWgEekFiyT4Ak35VAuuRkqgRXbct5v28iLOaftxHIl3JSmC58rYooem5wBMNcSZ3xZMT+CEQzIlQyDHkkgeIZRUoa2/oRMayNIsiXa//nE42MJKeUIxnCA9JZ4KPABigm927htfu3XzKd2Jx+4nz/hPiW6ks9O9WCD2hcdgYwyxcWyTkaxci6sWJhngs/YIzcxn/fuBJTqczXio3v0QD0RNS4PPxsm/8W++fv+I0qjIj7fqMjrNOZYiy8A3yyHdrsS5IozNZbxJBHuB3yJ9rkfssVMN+nYn4weEwE9sDIs9sF6zvZTutI4Ihyg9NspTUR8YY94Aq6K0qr/36KVTMFKzlT3R+BeqixjDq79XAI+Ac4KsWhwSul6mV1S+1sbtMNTBTSjoEMuwv9eICsh3pylfNjxwN8YkeKIP/VJ6jshEEzq7UZVwJdb+kj8LCC+/7wKybpinVqAUIYxLjE9GNdlrSXe9jCTvYXc3c069SmOhCqtF1uNnhjbL0PJs4Q== X-Forefront-Antispam-Report: CIP:198.47.23.194;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:lewvzet200.ext.ti.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(376014)(36860700016)(1800799024)(82310400026)(23010399003)(10067099003)(56012099006)(6133799003)(22082099003)(18002099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: gppHysRWr4V+LXczYhMYfLnx1mo58uX6M2Ep74Yeo5ToU3c2KmHvrJmfqN4AzgLcysQMKxPfUYDojrOiWeKrFg9eKFqQV2/Jktpu4jd69TjkcHiYDS1+OtYWRrHHCtbeWUQSfZzvPrxiQB9kyMKz25MJjcF8dJsKBWzKXgKslyhOv3uIJUZ5fdgPvD/iMpNdo+dZWcd+utQFa/gwo1Bh3uhSv81PqMdk8/29n8Ks/d/zjR1SprSRndyVWRJo5usvAS7lHhLE8ZBczmkrHrAXSL7zsUxKZhmr1tM/IycLqxzwMtCIcsgYfYcpvlK0W4ZqbphoaQ0f25R65hGD7vGdZPdxxfbsyVg1/7m5gD6ODgvVkmWCssZO7ocMfxcSm7Co9z798mpr2+Da84tMi/+jYHBOOBoVRHyb0Dj1jJpYVYWzmjiPXxldpKx0/WNQQ3yI X-Exchange-RoutingPolicyChecked: PMHizu0Y5EbzDWqtm4wxq5QPWwewX76CCLY9K0Z0zLAphu+GA7TZMkHG1pbBYsIiCHuotfVNCh4RBB1f/+Fe0SW9mVmVBcCq5AcZp/VgZgAqP8Ym67Q4oJRiN/L7CDwOh3N1iMRJqeGrh6AQIvy4AgLwiKnXQuys+kSnQaXhr3m9iFSOsR42YZh/l9krKliJGMNiUzK4RuVvbEef0ZTgtbkuo7QwQMGoL+Ctzqw2YgH6PJvKF/gXodeA4EhOhHwz+FPhSlCwOjNAYA+eSXHcTbpf+glErCRFz3srdfD7ew+dnaHmyK+t93cnhf1PeUS3deXAVMdbgUGuDpb6t9nZRQ== X-OriginatorOrg: ti.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Aug 2026 13:24:02.9117 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5eabca15-abc7-4769-bc61-08df043e765f X-MS-Exchange-CrossTenant-Id: e5b49634-450b-4709-8abb-1e2b19b982b7 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=e5b49634-450b-4709-8abb-1e2b19b982b7;Ip=[198.47.23.194];Helo=[lewvzet200.ext.ti.com] X-MS-Exchange-CrossTenant-AuthSource: SJ5PEPF000001D3.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR10MB997675 X-Proofpoint-ORIG-GUID: 2rPR7pfeqDL1_5kr4Y001HnAzVbweUJ6 X-Proofpoint-GUID: 2rPR7pfeqDL1_5kr4Y001HnAzVbweUJ6 X-Authority-Analysis: v=2.4 cv=VrMTxe2n c=1 sm=1 tr=0 ts=6a903a78 cx=c_pps a=fY0JyvE1RNjZr0fjhzOn9Q==:117 a=WotqVVQAdb04rnGuttW3Kw==:17 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=Sv0fKeRqtYgA:10 a=s63m1ICgrNkA:10 a=V5UXEbMT0ywA:10 a=VkNPw1HP01LnGYTKEx00:22 a=Z8NIEmU8O1QQgoT56wFK:22 a=jwouBfj2j3NM8CExmVVE:22 a=sozttTNsAAAA:8 a=Tpn98H0sjD_mw3BxSIoA:9 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODI3MDExMiBTYWx0ZWRfXxPAk/W0q+EPd ew8Z+bnHaTlcxzs3r5vEE6ova4O2stOmKBpcqDEy/VTbQd9zXCAdRfXpKGA3+1LSI0D+pu3fbX8 QypMS/Tz3i2x6Tst9OD+H9jc8E55tUmHrwVY5Z1RW7i7P35QcaxUisBXvmGdnV1y42HWlbRwbqu cJ/sDE+mwwQ3+0Aig5BtXdAtMS2I5Qo2FklroF/flYWKsuFC0EZSUnUpSig1jmRvk33sU9jY8YR HZlRTH4PbaKB7WiXL/hXlTLwc8pQNaxDBuO6oACkMKqxbmlnFso6VFM9+6leFVSn1rmTNBdGI92 QnvS518ei7BeXUwC0HpDUviERc05PB5WVLw1jyzJWfBH2F47A3qtvz8Ikms3MHrU8HyJsw1XomO X1XFTbNQrK8p5h8TSxdoXo9yVMKhN875hj3AoFxWeuSYx9E407Pus7v4vi8HV9ps1W0x50jCDsH /47tIMzK45ROZp9cDpw== X-Proofpoint-Spam-Info: AW1haW4tMjYwODI3MDExMiBTYWx0ZWRfX201fAKzj5Uyd ugnQIZDQk56EcpG9WbIIvijGUIOtHcElQpu6b29bGH+N+8EDtxPuO77/KzuiWn5apSSMauGICh/ ljL+4kStqEW/eYGyyCBgV7fPS7n6Qpc= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-08-27_05,2026-08-26_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 impostorscore=0 suspectscore=0 malwarescore=0 clxscore=1015 priorityscore=1501 phishscore=0 spamscore=0 adultscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608270112 AES functions were using src and dst scatterlists directly provided by the request. This is problematic as it is not guaranteed that the input scatterlist is exactly the length reqired. This problem was seen in IPSec use case when the kernel provides the scatterlist which contains space for plaintext/ciphertext and TAG. The problem comes when the scatterlist is mapped and sent via DMA. The K3 UDMA sends/waits for the amount of data equal to the length of scatterlist mapped. So when the last mapped nent contains some extra length, the DMA keeps waiting for the extra data and eventually times out and crashes. Mitigate this by copying the nents to a local scatterlist, copying only exactly cryptlen of data. Note that this does not copy the whole data, but rather only the scatterlist mapping. So it is not as penalising on performance. Fixes: 52f641bc63a4 ("crypto: ti - Add driver for DTHE V2 AES Engine (ECB, CBC)") Signed-off-by: T Pratham Reviewed-by: Kamlesh Gurudasani --- drivers/crypto/ti/dthev2-aes.c | 146 ++++++++++++++++----------------- 1 file changed, 69 insertions(+), 77 deletions(-) diff --git a/drivers/crypto/ti/dthev2-aes.c b/drivers/crypto/ti/dthev2-aes.c index 4fdd24ee91637..8998e02b0e86e 100644 --- a/drivers/crypto/ti/dthev2-aes.c +++ b/drivers/crypto/ti/dthev2-aes.c @@ -108,20 +108,6 @@ enum aes_ctrl_mode_masks { #define POLL_TIMEOUT_INTERVAL HZ static int dthe_cipher_init_tfm(struct crypto_skcipher *tfm) -{ - struct dthe_tfm_ctx *ctx = crypto_skcipher_ctx(tfm); - struct dthe_data *dev_data = dthe_get_dev(ctx); - - if (!dev_data) - return -ENODEV; - - ctx->dev_data = dev_data; - ctx->keylen = 0; - - return 0; -} - -static int dthe_cipher_init_tfm_fallback(struct crypto_skcipher *tfm) { struct dthe_tfm_ctx *ctx = crypto_skcipher_ctx(tfm); struct dthe_data *dev_data = dthe_get_dev(ctx); @@ -155,19 +141,24 @@ static int dthe_aes_setkey(struct crypto_skcipher *tfm, const u8 *key, unsigned { struct dthe_tfm_ctx *ctx = crypto_skcipher_ctx(tfm); - if (keylen != AES_KEYSIZE_128 && keylen != AES_KEYSIZE_192 && keylen != AES_KEYSIZE_256) - return -EINVAL; - ctx->keylen = keylen; memcpy(ctx->key, key, keylen); - return 0; + crypto_sync_skcipher_clear_flags(ctx->skcipher_fb, CRYPTO_TFM_REQ_MASK); + crypto_sync_skcipher_set_flags(ctx->skcipher_fb, + crypto_skcipher_get_flags(tfm) & + CRYPTO_TFM_REQ_MASK); + + return crypto_sync_skcipher_setkey(ctx->skcipher_fb, key, keylen); } static int dthe_aes_ecb_setkey(struct crypto_skcipher *tfm, const u8 *key, unsigned int keylen) { struct dthe_tfm_ctx *ctx = crypto_skcipher_ctx(tfm); + if (keylen != AES_KEYSIZE_128 && keylen != AES_KEYSIZE_192 && keylen != AES_KEYSIZE_256) + return -EINVAL; + ctx->aes_mode = DTHE_AES_ECB; return dthe_aes_setkey(tfm, key, keylen); @@ -177,6 +168,9 @@ static int dthe_aes_cbc_setkey(struct crypto_skcipher *tfm, const u8 *key, unsig { struct dthe_tfm_ctx *ctx = crypto_skcipher_ctx(tfm); + if (keylen != AES_KEYSIZE_128 && keylen != AES_KEYSIZE_192 && keylen != AES_KEYSIZE_256) + return -EINVAL; + ctx->aes_mode = DTHE_AES_CBC; return dthe_aes_setkey(tfm, key, keylen); @@ -185,24 +179,19 @@ static int dthe_aes_cbc_setkey(struct crypto_skcipher *tfm, const u8 *key, unsig static int dthe_aes_ctr_setkey(struct crypto_skcipher *tfm, const u8 *key, unsigned int keylen) { struct dthe_tfm_ctx *ctx = crypto_skcipher_ctx(tfm); - int ret = dthe_aes_setkey(tfm, key, keylen); - if (ret) - return ret; + if (keylen != AES_KEYSIZE_128 && keylen != AES_KEYSIZE_192 && keylen != AES_KEYSIZE_256) + return -EINVAL; ctx->aes_mode = DTHE_AES_CTR; - crypto_sync_skcipher_clear_flags(ctx->skcipher_fb, CRYPTO_TFM_REQ_MASK); - crypto_sync_skcipher_set_flags(ctx->skcipher_fb, - crypto_skcipher_get_flags(tfm) & - CRYPTO_TFM_REQ_MASK); - - return crypto_sync_skcipher_setkey(ctx->skcipher_fb, key, keylen); + return dthe_aes_setkey(tfm, key, keylen); } static int dthe_aes_xts_setkey(struct crypto_skcipher *tfm, const u8 *key, unsigned int keylen) { struct dthe_tfm_ctx *ctx = crypto_skcipher_ctx(tfm); + int ret; if (keylen != 2 * AES_KEYSIZE_128 && keylen != 2 * AES_KEYSIZE_192 && @@ -210,15 +199,12 @@ static int dthe_aes_xts_setkey(struct crypto_skcipher *tfm, const u8 *key, unsig return -EINVAL; ctx->aes_mode = DTHE_AES_XTS; - ctx->keylen = keylen / 2; - memcpy(ctx->key, key, keylen); - - crypto_sync_skcipher_clear_flags(ctx->skcipher_fb, CRYPTO_TFM_REQ_MASK); - crypto_sync_skcipher_set_flags(ctx->skcipher_fb, - crypto_skcipher_get_flags(tfm) & - CRYPTO_TFM_REQ_MASK); + ret = dthe_aes_setkey(tfm, key, keylen); + if (ret) + return ret; - return crypto_sync_skcipher_setkey(ctx->skcipher_fb, key, keylen); + ctx->keylen = keylen / 2; + return 0; } static void dthe_aes_set_ctrl_key(struct dthe_tfm_ctx *ctx, @@ -341,8 +327,10 @@ static int dthe_aes_run(struct crypto_engine *engine, void *areq) struct dthe_aes_req_ctx *rctx = skcipher_request_ctx(req); unsigned int len = req->cryptlen; + unsigned int pad_len = 0; struct scatterlist *src = req->src; struct scatterlist *dst = req->dst; + struct scatterlist *sg; int src_nents = sg_nents_for_len(src, len); int dst_nents = sg_nents_for_len(dst, len); @@ -385,38 +373,38 @@ static int dthe_aes_run(struct crypto_engine *engine, void *areq) * We need to handle the padding in the driver. */ if (ctx->aes_mode == DTHE_AES_CTR && req->cryptlen % AES_BLOCK_SIZE) { - unsigned int pad_size = AES_BLOCK_SIZE - (req->cryptlen % AES_BLOCK_SIZE); - u8 *pad_buf = rctx->padding; - struct scatterlist *sg; - - len += pad_size; + pad_len = AES_BLOCK_SIZE - (req->cryptlen % AES_BLOCK_SIZE); + len += pad_len; src_nents++; dst_nents++; + } - src = kmalloc_array(src_nents, sizeof(*src), GFP_ATOMIC); - if (!src) { - ret = -ENOMEM; - goto aes_ctr_src_alloc_err; - } - - sg_init_table(src, src_nents); - sg = dthe_copy_sg(src, req->src, req->cryptlen); - memzero_explicit(pad_buf, AES_BLOCK_SIZE); - sg_set_buf(sg, pad_buf, pad_size); + src = kmalloc_array(src_nents, sizeof(*src), GFP_ATOMIC); + if (!src) { + ret = -ENOMEM; + goto aes_src_alloc_err; + } - if (diff_dst) { - dst = kmalloc_array(dst_nents, sizeof(*dst), GFP_ATOMIC); - if (!dst) { - ret = -ENOMEM; - goto aes_ctr_dst_alloc_err; - } + sg_init_table(src, src_nents); + sg = dthe_copy_sg(src, req->src, req->cryptlen); + if (pad_len > 0) { + memzero_explicit(rctx->padding, AES_BLOCK_SIZE); + sg_set_buf(sg, rctx->padding, pad_len); + } - sg_init_table(dst, dst_nents); - sg = dthe_copy_sg(dst, req->dst, req->cryptlen); - sg_set_buf(sg, pad_buf, pad_size); - } else { - dst = src; + if (diff_dst) { + dst = kmalloc_array(dst_nents, sizeof(*dst), GFP_ATOMIC); + if (!dst) { + ret = -ENOMEM; + goto aes_dst_alloc_err; } + + sg_init_table(dst, dst_nents); + sg = dthe_copy_sg(dst, req->dst, req->cryptlen); + if (pad_len > 0) + sg_set_buf(sg, rctx->padding, pad_len); + } else { + dst = src; } tx_dev = dmaengine_get_dma_device(dev_data->dma_aes_tx); @@ -503,19 +491,19 @@ static int dthe_aes_run(struct crypto_engine *engine, void *areq) dma_unmap_sg(tx_dev, src, src_nents, src_dir); aes_map_src_err: - if (ctx->aes_mode == DTHE_AES_CTR && req->cryptlen % AES_BLOCK_SIZE) { + if (ctx->aes_mode == DTHE_AES_CTR && req->cryptlen % AES_BLOCK_SIZE) memzero_explicit(rctx->padding, AES_BLOCK_SIZE); - if (diff_dst) - kfree(dst); -aes_ctr_dst_alloc_err: - kfree(src); -aes_ctr_src_alloc_err: - /* - * Fallback to software if ENOMEM - */ - if (ret == -ENOMEM) - ret = dthe_aes_do_fallback(req); - } + if (diff_dst) + kfree(dst); + +aes_dst_alloc_err: + kfree(src); +aes_src_alloc_err: + /* + * Fallback to software if ENOMEM + */ + if (ret == -ENOMEM) + ret = dthe_aes_do_fallback(req); local_bh_disable(); crypto_finalize_skcipher_request(dev_data->engine, req, ret); @@ -1214,6 +1202,7 @@ static int dthe_aead_decrypt(struct aead_request *req) static struct skcipher_engine_alg cipher_algs[] = { { .base.init = dthe_cipher_init_tfm, + .base.exit = dthe_cipher_exit_tfm, .base.setkey = dthe_aes_ecb_setkey, .base.encrypt = dthe_aes_encrypt, .base.decrypt = dthe_aes_decrypt, @@ -1225,7 +1214,8 @@ static struct skcipher_engine_alg cipher_algs[] = { .cra_priority = 299, .cra_flags = CRYPTO_ALG_TYPE_SKCIPHER | CRYPTO_ALG_ASYNC | - CRYPTO_ALG_KERN_DRIVER_ONLY, + CRYPTO_ALG_KERN_DRIVER_ONLY | + CRYPTO_ALG_NEED_FALLBACK, .cra_alignmask = AES_BLOCK_SIZE - 1, .cra_blocksize = AES_BLOCK_SIZE, .cra_ctxsize = sizeof(struct dthe_tfm_ctx), @@ -1236,6 +1226,7 @@ static struct skcipher_engine_alg cipher_algs[] = { }, /* ECB AES */ { .base.init = dthe_cipher_init_tfm, + .base.exit = dthe_cipher_exit_tfm, .base.setkey = dthe_aes_cbc_setkey, .base.encrypt = dthe_aes_encrypt, .base.decrypt = dthe_aes_decrypt, @@ -1248,7 +1239,8 @@ static struct skcipher_engine_alg cipher_algs[] = { .cra_priority = 299, .cra_flags = CRYPTO_ALG_TYPE_SKCIPHER | CRYPTO_ALG_ASYNC | - CRYPTO_ALG_KERN_DRIVER_ONLY, + CRYPTO_ALG_KERN_DRIVER_ONLY | + CRYPTO_ALG_NEED_FALLBACK, .cra_alignmask = AES_BLOCK_SIZE - 1, .cra_blocksize = AES_BLOCK_SIZE, .cra_ctxsize = sizeof(struct dthe_tfm_ctx), @@ -1258,7 +1250,7 @@ static struct skcipher_engine_alg cipher_algs[] = { .op.do_one_request = dthe_aes_run, }, /* CBC AES */ { - .base.init = dthe_cipher_init_tfm_fallback, + .base.init = dthe_cipher_init_tfm, .base.exit = dthe_cipher_exit_tfm, .base.setkey = dthe_aes_ctr_setkey, .base.encrypt = dthe_aes_encrypt, @@ -1283,7 +1275,7 @@ static struct skcipher_engine_alg cipher_algs[] = { .op.do_one_request = dthe_aes_run, }, /* CTR AES */ { - .base.init = dthe_cipher_init_tfm_fallback, + .base.init = dthe_cipher_init_tfm, .base.exit = dthe_cipher_exit_tfm, .base.setkey = dthe_aes_xts_setkey, .base.encrypt = dthe_aes_encrypt, -- 2.34.1