From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0a-0002e601.pphosted.com (mx0a-0002e601.pphosted.com [148.163.150.75]) (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 755784A1396; Fri, 16 Oct 2026 12:46:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=148.163.150.75 ARC-Seal:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792154766; cv=fail; b=m6nqe/TlUw+HmyzG2R5f1hr7kEt/tXanox7lgV0rUHPR6yLaU0V5QV0koWiY86AcrpNdOXoFoY/Y0lXhnhNbJ+g25k/M/zZSmEf42v61nQnTbK/+y0az5Dgue7b3vxDW/vWX3vRl/Hm1NBbliszQQ4MHUYXRbOh3ZBQWoQZEQyw= ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792154766; c=relaxed/simple; bh=aV+ipZvdXSdnUp6UOIuFYm1y4+u68uOYzMLLJIcG/eo=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=q6XZsy9liVIJTBppKqrNcHcjyAFgNl2ln99mI7t3XbQwTOGYEM3onstvA4nuCU2FzCAvuC3IDhuCpxgXREiFpn9xRU/Yl45NY/y/bRe0xerDoyIfCxw/DTlSXzx6P1+pkCms0Ox9aZPm91X9ke/Kh9LmNL91GmiXxN1MIFbvFIs= 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=HAglO3Ov; dkim=pass (1024-bit key) header.d=ticloud.onmicrosoft.com header.i=@ticloud.onmicrosoft.com header.b=LAdFqG43; arc=fail smtp.client-ip=148.163.150.75 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="HAglO3Ov"; dkim=pass (1024-bit key) header.d=ticloud.onmicrosoft.com header.i=@ticloud.onmicrosoft.com header.b="LAdFqG43" Received: from pps.filterd (m0384305.ppops.net [127.0.0.1]) by m0384305.ppops.net (8.18.1.11/8.18.1.11) with ESMTP id 69GAChTw3703809; Fri, 16 Oct 2026 07:46:01 -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=q3FMsi+qFAHEBGnMFcYlHHV3VXpI70/6TZKNyC5i1 r0=; b=HAglO3OvljA0kaL/y3m7jMpAu4qk3Z7nan/HqmKfppeRTppgLeX0Uv4xe WldnRGoqABcxER2JIxZMUioFGnb1hO1r7wt47r2nN7B0WIhq8zIPYQBfUTQxEk8j O7jJdpgL9hFDiFFJa6qWtxdUpN9Qpo6sAO9+k4fVwK7Y/Gah8pGezazqtJ2wAsJv Mz8mqclpUYFNW+5S+sifGRyag6x+zdDxsE42mh++KbD3slx9CN5ixzlMyrRI3TZ3 eM8iq5lmvIof7uObbgdsklKXMRJ5lrKNXiyO3g/537skCF6UjlOghgT/WYobPED1 0qNrGudu4cFt/c6RJgj9fASWQ5j8g== Received: from bn1pr04cu002.outbound.protection.outlook.com (mail-eastus2azon11010002.outbound.protection.outlook.com [52.101.56.2]) by m0384305.ppops.net (PPS) with ESMTPS id 4hbhbg8t79-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Fri, 16 Oct 2026 07:46:01 -0500 (CDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=y9nPTHQZ/KoPPAg5d8bApIKBivUFQymXZKfoDUvY3OxIn5uj7fiVsbp6P99IG6oLN3gHDucoTROpipYrLYJU/qjwynOPjPY2w7ZLWRDFsFBGoGvBzN7xwj3d5ucZulsPg4J2BztD+CmBkouAwFxpV6GQVtajxK+/iHQTMIqIvIEN2yCw9QA3x6ld/VvbmW0IXMuiqzOKSKVDEGaIiOj5kXgA7T8daOMin4/BqAsXg8tine2Rw8kSGASDJQQ6VgUDQYOg42lgNCTWXGJYdonG9stsgkduO91tBf0emivg1A5Dzl9zJeAJRkIC+I0VNZHsE526c6CI/tzRXo82F8HXgA== 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=q3FMsi+qFAHEBGnMFcYlHHV3VXpI70/6TZKNyC5i1r0=; b=cxz4/sIfa7IXKz2VO5S/G3mI+rgq7m2WGK8wZ4n0nXg9o9lmto4GIcOpbLc8MZIeFME9gDfcldb6GFgkQhJg2X93YwyG7ko4hbj+fOhFzUdHJwSdRBaVF5n7Oc0FPX0BPe58N1O6/stfyRmZZlJtiqpKgtoNWheRoJ7/q7h7S/6BzvCicluvA09IKhgblsiT2NZ3WfXrqrgd7+PHuQXu+OGTzdovIhgZW9IyHyf0C7sUUgtSeKkbb6JVwcDhbGGCa6q9hyplbAKVW1sCGIivboxl0P5pmTSFrHDx/D3RVdSeCkKzaB6q+dI7SdZIiIUvsVM3TuThr0S/jwQHpJ3iiw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 198.47.23.195) 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=ticloud.onmicrosoft.com; s=selector1-ticloud-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=q3FMsi+qFAHEBGnMFcYlHHV3VXpI70/6TZKNyC5i1r0=; b=LAdFqG437dJzv1SJmxd8GgM+uHDLWtcoqQBBUJ4+4JEg2UW9fJ5l4UDFTrJ3yyLOZJEkdSCDkTGZHjfPojej2HkUa68TbBbGKzIhIN3egYOrQ/bgjmIbOkxyOQUr73uXRoAu96so3dqK+TXLMyZ4qRA0Rb4LGGlyIKMbM6VY12M= Received: from BN0PR03CA0038.namprd03.prod.outlook.com (2603:10b6:408:e7::13) by IA0PR10MB7666.namprd10.prod.outlook.com (2603:10b6:208:481::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.546.12; Fri, 16 Oct 2026 12:45:58 +0000 Received: from BN2PEPF0000A993.namprd04.prod.outlook.com (2603:10b6:408:e7:cafe::c) by BN0PR03CA0038.outlook.office365.com (2603:10b6:408:e7::13) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.522.17 via Frontend Transport; Fri, 16 Oct 2026 12:45:57 +0000 X-MS-Exchange-Authentication-Results: mx.microsoft.com 1; spf=pass (sender IP is 198.47.23.195) 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.195 as permitted sender) receiver=protection.outlook.com; client-ip=198.47.23.195; helo=lewvzet201.ext.ti.com; pr=C Received: from lewvzet201.ext.ti.com (198.47.23.195) by BN2PEPF0000A993.mail.protection.outlook.com (10.167.248.135) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.522.6 via Frontend Transport; Fri, 16 Oct 2026 12:45:57 +0000 Received: from DLEE212.ent.ti.com (157.170.170.114) by lewvzet201.ext.ti.com (10.4.14.104) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45; Fri, 16 Oct 2026 07:45:29 -0500 Received: from DLEE208.ent.ti.com (157.170.170.97) by DLEE212.ent.ti.com (157.170.170.114) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45; Fri, 16 Oct 2026 07:45:29 -0500 Received: from lelvem-mr05.itg.ti.com (10.180.75.9) by DLEE208.ent.ti.com (157.170.170.97) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45 via Frontend Transport; Fri, 16 Oct 2026 07:45:29 -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 69GCjRmH2531361; Fri, 16 Oct 2026 07:45:28 -0500 From: T Pratham To: T Pratham , Herbert Xu , "David S. Miller" CC: Sebin Francis , Manorit Chawdhry , Praneeth Bajjuri , Vishal Mahaveer , Kamlesh Gurudasani , , Subject: [PATCH v10 05/15] crypto: ti - Trim scatterlists to correct length in AES Date: Fri, 16 Oct 2026 18:14:46 +0530 Message-ID: <20261016124456.1802080-6-t-pratham@ti.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20261016124456.1802080-1-t-pratham@ti.com> References: <20261016124456.1802080-1-t-pratham@ti.com> Precedence: bulk X-Mailing-List: linux-kernel@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: BN2PEPF0000A993:EE_|IA0PR10MB7666:EE_ X-MS-Office365-Filtering-Correlation-Id: b225d19e-7ccb-42f0-da41-08df2b836cb2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|23010399003|36860700016|82310400026|1800799024|376014|6133799003|10067099003|22082099003|18002099003|261009223027099003|56012099006; X-Microsoft-Antispam-Message-Info: JlnOl7tEjT3AfdYDE+qcGY3Ay7wBaH11uuERGzblXkmG9Ri71lPeIumc9Z8OGgaY/KK4muu/iYJdlcBZMfcWhRZc2G6NE3+MVOJTaJePrr2Y2j96d1SoiZM8HDF+w8hK9RIasC/viUTXarqWVDXxBCj9M1xHwOZRG2NL/UD6X7UNn2J01t5AysfM4WyS6Pl2FhC37/gMQ2vJAwMC3g5pWKIOeRY3hO64xuSoHkkL3iDF4DkdtWgTPTj05I2ABitcOhNASXzxbF7/E71+hKJaSm4ouWaPwZvRGOU+Hk93BiPKE9gEqX+l4AwVPc3KnXOmacHln7s3qOJkCRUxHDtRSP5CkpCdL3vYvG1G5LRYalb7Z78s8QtiQv5y2yHmTnm8Xj0pzX4wAutpLiVXWF7BOwoLACnvy71q2z4A+5hhEHEb/4HzSOt8glBLxnHadyaOaY/nMUP/LJeVzAPgAYEDLrqE7Ssy9WXypgHkKoxHTEJsnJ6APRDEFAPQL8tHxr2mv6GleN7mLv9aEpmwm6dfWmh4nryJMdWEmHvrC5YPOqk58tEzwYyGEykpn8rFU8b2V/nGiDjnIZIvx+ZAXZXI+i81FlPfBw83ycKm3XV1gIyLnSIQXZUp0QFryU95vvqxbUCL4mPLkIEQq7rViajPX2J3VvEfxx51W6fI4pttfcroODVKzvXXUYcZD6YwFD3hLIJSWFEYmgdtgdrit529JA== X-Forefront-Antispam-Report: CIP:198.47.23.195;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:lewvzet201.ext.ti.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(23010399003)(36860700016)(82310400026)(1800799024)(376014)(6133799003)(10067099003)(22082099003)(18002099003)(261009223027099003)(56012099006);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: xkxZLZ8c62GOVdvdJvMAx7H42vxx38ngDNu/ePMcSo/ABcLFnSGZlIsSPmoE2cROMA0GSi15ZZCyVQa4jH72iboV9MtNs7lgehRfGXI/9ZWIp4/xAJ+72CV2BToNXg1oYh9uaqrQfF2Wp9Vwa3bWfG5fyIusEKivSv80Lti7u63v5E0eOtQwaf1y/SAbpeEus61a7g9QEf/GW6SBMYkBSTlorLFpmOE9li96uVkHaZ3eB4y6feSlu7qWDFMQ295rcZPN3pEHiJmIAP7IfI16KFbKp6QqyBhjAign6mFh0Tw67U2IXXqEbMvJ7y1YZysNbnqP+G6ABknkHrHmOX78EF6rmRfpxRwiTuNroRITHXhbBy7o56rBEadxxP9/SvGVXFilKUEVc++0XBvuhxKCPvcHfHTgQOiVNTAskTADn4o/Wya7F1hChrKgpzLnQG8c X-Exchange-RoutingPolicyChecked: x4Rr2nNmKXg9tAyel2hrWwbpPIZgwZYdysoqgMZPWgaf7UTqvLNLMnPZnYPx5Zhi2mAqLcm5tqZsOrzlJHfXIVhIj1x+gF5IRTmLsKQTOeM5ak/9cDWzBkXaOC855HMXozQV3QT+mKBtHzPWh6cTqdpiz5/Gkpv7Pnypl4s6kZJrh5q0n90iL0HqTPChpiZEFGyH5CYEpx6v/KVW70tGe1Sy1oJ3hKoVO6Waj2/N1eI0KPQ2jPn70kCzBrSCl9c+2bIDG/X4Ii7hpjEKv3VQCFEXH09pSKZazyPq0xjOfkAVYKv2dM+a1y0IQfJhgiWSAeD75TsLWm1cs+FYiujwhw== X-OriginatorOrg: ti.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Oct 2026 12:45:57.3033 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b225d19e-7ccb-42f0-da41-08df2b836cb2 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.195];Helo=[lewvzet201.ext.ti.com] X-MS-Exchange-CrossTenant-AuthSource: BN2PEPF0000A993.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR10MB7666 X-Proofpoint-GUID: STsWP5ZL4POoBjHR3jp53hZFu0xFFFw5 X-Authority-Analysis: v=2.4 cv=BuoIUoX5 c=1 sm=1 tr=0 ts=6ad21c89 cx=c_pps a=l7cXxZGRKbMfBYROU17HtA==:117 a=f+v6EHfkeJbVwR46tk4DMg==:17 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=660iZSQnnn4A:10 a=s63m1ICgrNkA:10 a=AlMIdn_sM9wA:10 a=VkNPw1HP01LnGYTKEx00:22 a=Z8NIEmU8O1QQgoT56wFK:22 a=taLDd7a_hP9WKsMzeGRc:22 a=sozttTNsAAAA:8 a=Tpn98H0sjD_mw3BxSIoA:9 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYxMDE2MDA1MCBTYWx0ZWRfXxGTpzPU2c98X Cb1Bei/f4Gh1/1vHfWql6yL0a+CMfTjpLuxrrbdQZk8sJDj+ob+PxdZppgk/sRu/MP6OR9PnRiA LGQ/YbSvLxX0UAMNanNezFxJ+BbDTlS0/fOm0fmDIHNtneaEhB+YKR9l2NBwk44yAj3K80QduVe uAn5OLWmSq/OHbpNm3eyIEr//g0fYbKvq9iHkS//xVDe6WbdmgZgKkDLNJleACX11oHQY3bUywr dFsXjMMXh0fUT5F611z7PCmwzExSztv60fwOnxYpJ+fYdEA/+gVw93ZHy2Lz+A+S50aoAT2crnM Wyf57B64d7fKvZwMCLf4irTl+h1Y2QFbz9q64Bk+g5Gx4IFmUXTml5o09ySFf1j/z+2FTnm9blK c/da2AylA+At1f2rv3zGKykpGfl08QiRiRI2ZG4ugy0o+4DCpwWc1Eu9uS75c1U84reQyG63ICE ESDQNb6cKOlxEwjAQtQ== X-Proofpoint-Spam-Info: AW1haW4tMjYxMDE2MDA1MCBTYWx0ZWRfX4tLMs0+eG9Nk mK6hLJK7Tvg9j/OSaMjFQkHQ0R2RdwikHMEaMhq9yxdrZExMSHL+sg47z0+CEYHj522ov+DNlHo qgvdF7mp0fhNEmEf0piVNxxzP4H01J0= X-Proofpoint-ORIG-GUID: STsWP5ZL4POoBjHR3jp53hZFu0xFFFw5 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-10-16_01,2026-10-14_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 adultscore=0 bulkscore=0 priorityscore=1501 impostorscore=0 lowpriorityscore=0 spamscore=0 suspectscore=0 clxscore=1015 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2610080000 definitions=main-2610160050 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 | 145 ++++++++++++++++----------------- 1 file changed, 69 insertions(+), 76 deletions(-) diff --git a/drivers/crypto/ti/dthev2-aes.c b/drivers/crypto/ti/dthev2-aes.c index 789b336d093f4..be7ec62ab2513 100644 --- a/drivers/crypto/ti/dthev2-aes.c +++ b/drivers/crypto/ti/dthev2-aes.c @@ -108,19 +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); - - ctx->dev = dthe_get_dev(); - if (!ctx->dev) - return -ENODEV; - - 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); const char *alg_name = crypto_tfm_alg_name(crypto_skcipher_tfm(tfm)); @@ -154,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); @@ -176,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); @@ -184,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 && @@ -209,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, @@ -340,8 +327,10 @@ static int dthe_aes_run(struct crypto_engine *engine, void *areq) struct dthe_data *dev_data = rctx->dev_data; 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); @@ -384,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); @@ -502,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); @@ -1240,6 +1229,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, @@ -1251,7 +1241,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), @@ -1262,6 +1253,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, @@ -1274,7 +1266,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), @@ -1284,7 +1277,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, @@ -1309,7 +1302,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