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 02EF445A294; Thu, 10 Sep 2026 10:43:14 +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=1789036998; cv=fail; b=Ytsi74wJDrfpJSBQD7J4/nK+cKqHGzbtvyFvH7X2jRCnuZO9se4GTjKjpGLqktd86b5gFBKIJ86K8z/4HcxfQX5JFfldLtcjZcLWQ1PmK7uFh+wgxloWu7TkqnnTFsEKXGOY/jijDKbNK0YtlUm4bGy+YpQ+tasWLhLItCd0cj8= ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789036998; c=relaxed/simple; bh=14+lpbbjuBYbleZZptnnErmVsbsXKn0WAKM8jdF9Cmo=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=CHMm0wf2Ubpw7fVznu/frTiUDXghoUJGMo9Nk863Ah9JB4JlkSGUBTbH+tWkClmJt9w6wyMpe27FadDEspFvHz8CXY9ZCHw1wKnb+aXo455HJYLBr4gKAqCKN9nON5+7YrrJwhmUPwdwbE4fgc+JzVSEngfx5loUOXTZVyoijUE= 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=a2fTomyW; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b=RSsU3BD5; 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="a2fTomyW"; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b="RSsU3BD5" 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 68A8oHSb712625; Thu, 10 Sep 2026 05:43:12 -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=WCBqois36VGrEk3wC02QqgtiaiTky+9IMvxqB6ixU u4=; b=a2fTomyW7GIisOCByiw+W389SUVjXMtxOG6ayWKy3ZueWkqZw9Cx9rgmF wV6urY8INellgxWwYVZOMj6ERknTGJo0/r8rfWBxC6kJjy4y6TM2vGs9m4C5DtuD 3DOTK4Uuh0BvVoeE31ZQ+FcODz17ww/pj2ZcAYqrD/eN3d6G4AFzVIO1GNsFv+gD ECKNs9/ZzaimmtaBG4cEbq1XWAygudxcUNsM5ECx5u6r42NCk1azIaGVx7xeBYBj bsxZLDX0J4ammMnPODTf4OYogJGC2gKYbFGvjUQgeR5hN+3F3w3jU8gFFDszRuqv Me4mNeMCQfvC1SjJSJpCWKmP/y6Iw== Received: from ph0pr06cu001.outbound.protection.outlook.com (mail-westus3azon11011034.outbound.protection.outlook.com [40.107.208.34]) by m0384305.ppops.net (PPS) with ESMTPS id 4gkcxgcnxt-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Thu, 10 Sep 2026 05:43:11 -0500 (CDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ABeEarYwn4r9mS2p/KSI5OATWGFrE+SY4Rs3hdeZ81GwqDsZISaLRuGCkpTTbErs3wDyMxk8ErnDO49wfSzCi8YyUQ4Yl6EthjxAH+XRxcDEe296aAKR+0YRQaD5T5jW5BvDx5fYLdywAOx2s+jsxuiLYZdZNUfv/j9c+UG3z/xh/9EzLqnlJgznLFxoi7SXNfYr33mQihjy0WRO++Ro+xjIlsOiyqqq4hkJ+qYp+zwRa5IaSQlB6r8YWSW3qymNwd5VBcImzTg9lh6ZkKBHjArJrxYRlnyNiew5DpkeAq+bGbTdQEWsdZF3c7DcSNlQAhNLIPEbdYJ12aJUCRhokg== 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=WCBqois36VGrEk3wC02QqgtiaiTky+9IMvxqB6ixUu4=; b=r0/DFe7WCuF/jH/YO/8XEW4J/OstVsVqqLWOFgCy2d1k4wfXKosa606xqqGqQzTAeQHh1L7mxDgrpT2OBm6qbI4m/i1+Z7Mdyt2XBm3BiyxPXByz43fX17HZGX92BijxHI9J0pm6NulmRC0innCtnW+ALIic34dVcMqJ4opxiBRTMKZ/reExY0uMLiKkmNqc0d3GqvsMb5uHKeFj4pwB3Q2OqJ1g3ksZLnYhvbfhRIVTpNbM1XrVCYkUYIC+2MnLY7fAAZxeFenXnKi40armfVKAXuzb/zLqe65mI5jAs2MhweEShWxl7AyNoS3ziAy4Y1LQzgFMcjjzVYHZv2/KRQ== 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=WCBqois36VGrEk3wC02QqgtiaiTky+9IMvxqB6ixUu4=; b=RSsU3BD580enQL1HFCNA9EROwFIbbFT/adO3H5qZtJzLOa8u/stdt+osS/Ck/dSakuaKQ2ftUXk4kKrU47hI4IkxxwLezIB2NR3lU9UxSCv9sE39+gZxHnxs7VKNnaoSlxDczJNQi1TLeOvh+PTXordjT5CgEPUDs+mGsPILxSs= Received: from SJ0PR03CA0158.namprd03.prod.outlook.com (2603:10b6:a03:338::13) by MN7PR10MB700146.namprd10.prod.outlook.com (2603:10b6:208:638::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.406.7; Thu, 10 Sep 2026 10:43:08 +0000 Received: from SJ5PEPF000001E8.namprd05.prod.outlook.com (2603:10b6:a03:338:cafe::55) by SJ0PR03CA0158.outlook.office365.com (2603:10b6:a03:338::13) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.382.15 via Frontend Transport; Thu, 10 Sep 2026 10:43:08 +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 SJ5PEPF000001E8.mail.protection.outlook.com (10.167.242.196) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.406.5 via Frontend Transport; Thu, 10 Sep 2026 10:43:07 +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, 10 Sep 2026 05:42:42 -0500 Received: from DLEE202.ent.ti.com (157.170.170.77) 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, 10 Sep 2026 05:42:42 -0500 Received: from lelvem-mr05.itg.ti.com (10.180.75.9) by DLEE202.ent.ti.com (157.170.170.77) 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, 10 Sep 2026 05:42:42 -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 68AAge1O3150255; Thu, 10 Sep 2026 05:42: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 v3 05/12] crypto: ti - Trim scatterlists to correct length in AES Date: Thu, 10 Sep 2026 16:11:55 +0530 Message-ID: <20260910104202.1537226-6-t-pratham@ti.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260910104202.1537226-1-t-pratham@ti.com> References: <20260910104202.1537226-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: SJ5PEPF000001E8:EE_|MN7PR10MB700146:EE_ X-MS-Office365-Filtering-Correlation-Id: 20f9e006-2a7e-492c-7e94-08df0f284d1d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|23010399003|82310400026|1800799024|36860700016|376014|10067099003|6133799003|18002099003|22082099003|56012099006; X-Microsoft-Antispam-Message-Info: jW+8HFtgCQMYMlkVwVJYcsKOpLQcQhQ2L44WJoz6bWWj37jlWrB5TMZWHtai2WMmpvRV3wLU4sj9dlK7Cax1YIncf6cGNO4p8OrBVQUakgflZ0OPfqi38OoBwbfm3YiDIqle+jn6gxY2QeHSJVDwfgV9S00AoLF/LybpVQibLXBAW/IPXUPdJ/LethSjt5Nb2oDMaPWREtIHoY7tOemf+1OFE5eDIz79+1rZIgCBXDxSgU6DmVecrJxUlUNbjRwB59EjSmEHDPqb1Uwx4ASIPOg6PbDtw08eP8sRjDjFwc5frXlS1x9215JabcZnMWsWObzSqVUD51OWgiOy7VIz25Kj8xIgDg+nuliG78yFdGJ8p+4SHxgw7MA8uwzHFq9imLLbE1uaXx56RW8Ta2oD+R9LfoQxCqiRZsBRHtNzEvm4TR+Ooum0r60nmDdniQBMeiaEdj0aCkQ40FP+g/gQiGtbP462cKA70i68XohxQubnQzru0wiaym9aqYfiayA/qVM6nzvZ7y7JSHlrAGP9GfCqgFfRUGCNbYm/nFl3BOBDmhD/mjdgaJH3t/hl3i9ZIRNQyWEm3IaDTRIvA9W80tsHoAa6oZLT/5I9IIqtEkVH7RZ306Isy5yR2xkt8Aqje7GT1sLwz1STsaBYu+W9p6urvuNQmh1BwLahO/NA2RzYBP4dJYoYp4Dp3O1NOSp/j0Ax6Mq3G0CTPuNfvkWeTA== 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)(23010399003)(82310400026)(1800799024)(36860700016)(376014)(10067099003)(6133799003)(18002099003)(22082099003)(56012099006);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: H3FMXX4OaNhR9InLlEG0aDNDw3KP0wPIkkFW2Y7fZULbJGDmdOXgg+bREHtV/WQ71ZsANG92uFHkgdATML+I7gypDNNB+mQ2L4lNlQHTudCtx749kUktP5dp3iXpQcQ1ekQtqoTBkqcNBaSf96d07sOEL/cAlNgo5Td8VJBG/JVYECOfOWNgp2zmRoW0V5IyldqSmKuozbWVpJ3nbkRtZRGIPWMzFUS2gf16rKmOZhUk4LFWmYXpXjk6m1g0PYfYZ7rYVKoGIH9VofPQ7wPIOwzSibd5A4JNSL1khpoHW0pYjSlfuYmme83ga2En3ShCOLB+EGSuJ6qzWXx/f1orodp08W5Kk887U7HO/GVw6eUnetpwknzpcpFHPtQ1WdnRoad91vzoHWGoxrdKonBQkGk5CevJOUo+XgRXEPC2yPtfIQqzldLFmroYj4ZAW0Ra X-Exchange-RoutingPolicyChecked: JAvIaC1G1RM/NZg6ZU9jdAYZVR/Dx0vO10Kgr6jFRJHhA4d4/fqDVkFThMR70DMbXdu2vrWYa8m+/AXMpFqJp6MsYtYNUrGlC0YaE4EoVcc/4pYautf23Ut4+tikWA1tGRvj/1y4V05Gnp9/Ob5b73LGtZvRcx7rLi5dWLNn5H6XbCVaVKoI8FMu0le6ReOUCHrBp6+NUT+EEqXLqsknBNihV/T49HgQySHjA83h6zphYJh6Aru9Y24Egxjl5sXoBfggRGyKJr8n+6uRfOXuEx7ngghR0/jOuWvRY7/tNfbX3AeDNch6UC4XDtpJzPFZCFCAhRkPGnVr8XKRKIP4/Q== X-OriginatorOrg: ti.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Sep 2026 10:43:07.5362 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 20f9e006-2a7e-492c-7e94-08df0f284d1d 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: SJ5PEPF000001E8.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN7PR10MB700146 X-Proofpoint-ORIG-GUID: SKYTd8Xy80s8Fejh4S5pVOETWzTKczem X-Proofpoint-Spam-Info: AW1haW4tMjYwOTEwMDEyNCBTYWx0ZWRfX8dbPntVR5/bO bgYv6+QiU9ZacG30nxw3HcBF3XULl+b4qA02XYcWUcUY0jusfbGoMXGEhwJ4gCR98FcNybBlymd YLTXccAGM4+qoJplFwntVzN9EsYZPRA= X-Proofpoint-GUID: SKYTd8Xy80s8Fejh4S5pVOETWzTKczem X-Authority-Analysis: v=2.4 cv=MqbHeGae c=1 sm=1 tr=0 ts=6aa289bf cx=c_pps a=zZIwMYV7Wou7+0JapvgM9A==:117 a=WotqVVQAdb04rnGuttW3Kw==:17 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=VdqzKS8jKosA:10 a=s63m1ICgrNkA:10 a=V5UXEbMT0ywA:10 a=VkNPw1HP01LnGYTKEx00:22 a=Z8NIEmU8O1QQgoT56wFK:22 a=taLDd7a_hP9WKsMzeGRc:22 a=sozttTNsAAAA:8 a=Tpn98H0sjD_mw3BxSIoA:9 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTEwMDEyNCBTYWx0ZWRfXwk9jqIyJCqZS JfTh9wnZan9dKPHgYV9Me/pX+o9LtLRFOtPq2PD3gb/98tbmLYkYGCBvQqZ/9o9ogyussmUobiM D50/kFt/0ELNGSHOWowPO2iDqapxUvMoyBRhTaLOMc0+/4HsthZEzMLHvAJyHVBLVO/eqRW416j akFI+JPAtu8zs1UkM5ecDtS/P46vxMDKQNgUDFyqwR+XBEk6zwT1+IXKSFsfLPVur4X57QmECSd 5wos26eajvKq4lrrXNQ/aNWicgGOCshis7XDKfhnSiWNgYYFjhfDMfGnXDJAOyRf/Vpng+/JfUD tRQAthQTn1Fpprhbzk065l6JJYZFELSPytNiXuZxrPoFIHLzs/CQf6YUsJcWKXmei0iG4a68ikL fivOmG33UgAkJ2ukRq2v8HP6zIBFpX3EcD8U4FrkmvR3xwb9j37sUclK9F6N57+KyUMik8/g9Ed M8aQ1w/rk+ReXDOUHoA== 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-09-10_03,2026-09-09_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 impostorscore=0 phishscore=0 lowpriorityscore=0 priorityscore=1501 spamscore=0 bulkscore=0 adultscore=0 suspectscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2609040000 definitions=main-2609100124 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 6a8fbe67ef6cd..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 (!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