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 E73D544E67E; Wed, 30 Sep 2026 11:26:46 +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=1790767614; cv=fail; b=IJGdEymyCeHyiEmrE3gCcxtFcueIJp499iAL73+2459Ooc7USyt1trfq4fxm51yw450nUzTHt9nsnZkxSuCrdraRymblUCvADyEOdgNR257nnL8xCGpOssSFjRcll46q3kdsNG4eQ+BPl/MTXPeikpAsmKXCLJ1M2DbeAuOsvhY= ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790767614; c=relaxed/simple; bh=14+lpbbjuBYbleZZptnnErmVsbsXKn0WAKM8jdF9Cmo=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=OYs6r9bLBfequnS0acOSuj37jQmUnB5wWvFz3LvDXjC4qv8mdF2wLrqqraId8wbHoKz7oWOhqCslrNPWv3ZtysLST0KqOW9UCMhUZpLkduTESHmGrZTkDjIB//4o78e/lJTQSkFoz8A7PZkm42WZYN/kEQvSYiMDMRgeT76G+Jc= 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=P/I0sD/o; dkim=pass (1024-bit key) header.d=ticloud.onmicrosoft.com header.i=@ticloud.onmicrosoft.com header.b=Q2PrfBN1; 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="P/I0sD/o"; dkim=pass (1024-bit key) header.d=ticloud.onmicrosoft.com header.i=@ticloud.onmicrosoft.com header.b="Q2PrfBN1" Received: from pps.filterd (m0380145.ppops.net [127.0.0.1]) by m0380145.ppops.net (8.18.1.11/8.18.1.11) with ESMTP id 68UB5dcN2989898; Wed, 30 Sep 2026 06:26:42 -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=P/I0sD/oStxEQQYpkXHGuCQ/tQxLHMBEb0hNFrqnbZzFteS7Ya05JdlgS vHDLIFQYkicnPaZPsJib6hJROTQ5DvdBpvnxB8UDxrdNGbHr555Va6ZG63T/Pz1a 0PqkkgF6WrBbjzM8HLzKUqwM8eXaNSXvWQj8E2SoqnlcTflLg/jn3IvcBwN2gdMH cBvWBoaUPbHY+rYYcR/gOiJcq+u+yO4/YpIBuspsc+AN+MVUkHlQEQ5EuBhhkfOa YZSL17yVY/q029crBfwdyYlzSG57108vVZ2WsUBzhJZrENf+aCTBkxOm7QAOOiXW 9KCmhQcD7AmJujFG1+KJTvj50EacA== Received: from bn1pr04cu002.outbound.protection.outlook.com (mail-eastus2azon11010040.outbound.protection.outlook.com [52.101.56.40]) by m0380145.ppops.net (PPS) with ESMTPS id 4h10t1r80b-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Wed, 30 Sep 2026 06:26:42 -0500 (CDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=NuJK6lawuBjpSaLEQVq6/47w2Hu+XqJWB97kUe6h9za6RyB/VGalJXOrtilOvsYKW03UIJBKlomIyBhcKVncvdKr7lOQSa90KJBYI9u+4JuDcUl4QoibvRvnQ+KaJeysZ14lBhQ7Km7iwWgnKIdfloPACe5IPNwzegRklcqodMz39HIcfDKBFKZvHUEPRkikDmng1Ludnt0mhIdE0W8Pk3fmJtkQYc5HjGZp2bV5EYB96pPke0fBQKvmMxYbZLy0kcce7cjpLGBPC2NWqwy8a9xTjSOBxhMXdEcmVjkFALOM9P3TiGax4mzpT+L9igYf8GwZyuJOOgiSuD2TWdLtTw== 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=qgXFO1xlLSxqkOwzkgupLc4WPrIm9X375L7RJt4cwWlr4Ad6oa8Gel03oZUEDjDSv6+2t4fOoYb95B1kzTpPymcWinPvLKVpzH66PDeMbSbPWSHdKHs7BO4dmztNSAxWiIAozdi3Y2OXQfE24cS2DgBIJSLPAWvNe9xk5qmc0DYPJIWsV/V79Dgi/du+itIQsyINqWjDbHA5Zls2kJ6k+96MGTc4eAxoP+ebYyrKClNhr3VYI70WZ6T2bc04j2AxYjhU8Js6bNWN94vX+sgkaFIvpfzoc3izMCJgL+p9GfF4YYNscc2Bn1rO5xk/CX7KS4Q9Oh/3BPetKzJP+mY0rw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 198.47.21.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=WCBqois36VGrEk3wC02QqgtiaiTky+9IMvxqB6ixUu4=; b=Q2PrfBN1CvutuD8dIY1GbxXIq6hiisZgYc70VZJ+9U4W6oexaqlUYq6TQCTDVt/T6kttk2NNUGq7DVnmZNB42xvGKAOWKdhHPp+TdkBDZ3JnfFoULAvlvI6UaXazdiS50j233FQQ3ibioYC0tf0JvhZWoFs9vNSGnABRIfTgDlU= Received: from CH0PR13CA0047.namprd13.prod.outlook.com (2603:10b6:610:b2::22) by DS4PPF6AF3BF859.namprd10.prod.outlook.com (2603:10b6:f:fc00::d25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.472.7; Wed, 30 Sep 2026 11:26:31 +0000 Received: from CH1PEPF0000AD7E.namprd04.prod.outlook.com (2603:10b6:610:b2:cafe::8) by CH0PR13CA0047.outlook.office365.com (2603:10b6:610:b2::22) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.472.15 via Frontend Transport; Wed, 30 Sep 2026 11:26:31 +0000 X-MS-Exchange-Authentication-Results: mx.microsoft.com 1; spf=pass (sender IP is 198.47.21.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.21.195 as permitted sender) receiver=protection.outlook.com; client-ip=198.47.21.195; helo=flwvzet201.ext.ti.com; pr=C Received: from flwvzet201.ext.ti.com (198.47.21.195) by CH1PEPF0000AD7E.mail.protection.outlook.com (10.167.244.87) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.472.14 via Frontend Transport; Wed, 30 Sep 2026 11:26:30 +0000 Received: from DFLE205.ent.ti.com (10.64.6.63) by flwvzet201.ext.ti.com (10.248.192.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45; Wed, 30 Sep 2026 06:25:57 -0500 Received: from DFLE200.ent.ti.com (10.64.6.58) by DFLE205.ent.ti.com (10.64.6.63) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45; Wed, 30 Sep 2026 06:25:57 -0500 Received: from lelvem-mr06.itg.ti.com (10.180.75.8) by DFLE200.ent.ti.com (10.64.6.58) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45 via Frontend Transport; Wed, 30 Sep 2026 06:25:57 -0500 Received: from pratham-Workstation-PC (pratham-workstation-pc.dhcp.ti.com [10.24.53.205]) by lelvem-mr06.itg.ti.com (8.18.1/8.18.1) with ESMTP id 68UBPtdt3025175; Wed, 30 Sep 2026 06:25:56 -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 v6 05/15] crypto: ti - Trim scatterlists to correct length in AES Date: Wed, 30 Sep 2026 16:55:23 +0530 Message-ID: <20260930112533.1593952-6-t-pratham@ti.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260930112533.1593952-1-t-pratham@ti.com> References: <20260930112533.1593952-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: CH1PEPF0000AD7E:EE_|DS4PPF6AF3BF859:EE_ X-MS-Office365-Filtering-Correlation-Id: 5ae258d8-3774-432c-21e5-08df1ee5ac8b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|23010399003|376014|1800799024|82310400026|36860700016|6133799003|10067099003|56012099006|18002099003|22082099003; X-Microsoft-Antispam-Message-Info: H+Yy8VQOXUio9bv+zCOmFnw1whrmuWeFO6tBTBsKFaSNNSxgWlqLKomEVHTKZTJjGX8v/OYrpdqoPkYMyV+zhY6CHuhVRE/ggRnItAHlfcKDYtNkkJL4jyG/5bRttOTzU6WW5g6Xgdr8RG8SEcvKviJXB6TljE3go/6LTWvwMSVvfzsV8USC7MhAgWli6lP41YblOqat2uvsf47Ji87tXiO8LB0z60bysAn5t6yS0CGvgUtGxohQgeJUAK+UpN8nvoe/ZnfhaORz0TdHkWGjED63GYjRGzrkoBZAIPJMTthAcDSWY2j4bd+fzln2MTebW87gcmEOofp8VHfsNJbgvD6r/mMNT37GH76s2f4gDGMDVLS1LCUJScQtYMXR1n0Hti5+axHjiVwX2XAUsU5GneBiooBGJkujB+cxMuBW96HUtkOiImDH/jfXsHLj4nu+0IdCgFcUnJulCmnpgw+gVqDuE48EbFBURlQFshX6QwvNybRL3GjRhke9+B+8ko1SteNflbYm8DMfQd3i1sTBjb+UCx8EdOd2mE3YxRCykU1QDaGN507xfNJ44oJDiQmyXDKw5JCVjkQCQVlOW0LFVqX1bLWb0Lm5/0QrjB0FSDebErJ6J5eZC0gq6XNz9YwGU6oT7ytRP/xKgGAE9rTfBO3VwzdJ4mZ8285wQA6TJoxbybLg4LXAttR9pRxYonuQ/M0YiHfG3BmJPcdDlZZynw== X-Forefront-Antispam-Report: CIP:198.47.21.195;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:flwvzet201.ext.ti.com;PTR:ErrorRetry;CAT:NONE;SFS:(13230040)(23010399003)(376014)(1800799024)(82310400026)(36860700016)(6133799003)(10067099003)(56012099006)(18002099003)(22082099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 6jmpT18foWlY9XnFiryCdbxlBf1i1D/jhQz60ZIOuP/8OkFYmuGuI3+Mqt8NUZhmSWiJY18cWc9RpbwB5eLrVTzMxkQ3N8g4YzfdRRNmQO2ivmifEW0d0GmY+awj9wKha+5QK0c0iT+aI5ClbjT7Oax/ilfSWKZf83reHGhstPfIFyjOWXvGJdeL6ErzQkyrXHkhaIfdlU1YDu10NSQGlXqjREjpmm5F12P6RiqDDZezWlFDBpQkZDh0aUIWeucyZY1QpeeYWNOlStheHMb5sTuzYY382nGdpaMTPO614J1B6YiBnDLo4Fw6hyJf/SGdnYL2xS8kEPj9Kc90VXyGP7432up56BqR+g0zWNxinAv7Kwud2kVzssFKkK3pD6r6vQlkJQFlT7JSPEzM80ErL8NRyGb5A5LE8DYU23RBKYU5LBbxPVQJrBGxdu5QP2Kj X-Exchange-RoutingPolicyChecked: fItjo5Y8yKJx4UWxOIc+O1i5muV9os1V5VP7JzKzqfScXd+978pqLbaN3+vaRFbdMVK/y9uSGv9TgJxtMVsh8QbGzuVPLJTcIhi2eFvdky34G9cl3A/LzZ+8s/TKYCrxN3Mm9cPu58U6GGkhdKlVqDsExhNa+hWdrD7iHui2UMvFWltMfoxQPDjzfW+mPWCmFTf0y2YsxtsbUWD+myiwSfY6Mkt4+GxwnT6DlmWh1QvYJP/atXjY6tee32SkWo5p6OrZYV2WAEVENrlk+njzcUM/YwZEpw4z0z21zx7dplfDfqy7PPiXXkoa0cJg8Gc99MtCdB6otghm1zpXdYIObQ== X-OriginatorOrg: ti.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Sep 2026 11:26:30.0093 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5ae258d8-3774-432c-21e5-08df1ee5ac8b X-MS-Exchange-CrossTenant-Id: e5b49634-450b-4709-8abb-1e2b19b982b7 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=e5b49634-450b-4709-8abb-1e2b19b982b7;Ip=[198.47.21.195];Helo=[flwvzet201.ext.ti.com] X-MS-Exchange-CrossTenant-AuthSource: CH1PEPF0000AD7E.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS4PPF6AF3BF859 X-Proofpoint-Spam-Info: AW1haW4tMjYwOTMwMDA0NSBTYWx0ZWRfX5e/z7BR3as2/ ccK7nHkdU6uBf7WjbUxnNaW9+CosbfZ0F9lF99E9PmBShddUYCCLyiG/i8bnSniruoxbvXFKktx JJeAfslcBSDrFktHfTHGLmyvdoE3TYE= X-Proofpoint-ORIG-GUID: HUUHPZ78xBQs36oTBkAdfIFsRBhYFiwi X-Authority-Analysis: v=2.4 cv=C7R8WgP+ c=1 sm=1 tr=0 ts=6abcf1f2 cx=c_pps a=gS8+cbQEeirDoRw2OPG9zw==:117 a=tJyPKKxUohctrY4NYmUjkA==:17 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=VdqzKS8jKosA:10 a=AlMIdn_sM9wA:10 a=VkNPw1HP01LnGYTKEx00:22 a=Z8NIEmU8O1QQgoT56wFK:22 a=gO1vWkAQAl3rybz1DQOp:22 a=sozttTNsAAAA:8 a=Tpn98H0sjD_mw3BxSIoA:9 X-Proofpoint-GUID: HUUHPZ78xBQs36oTBkAdfIFsRBhYFiwi X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTMwMDA0NSBTYWx0ZWRfX2iNqU+EbLJCY AURAaFt5w4l0xRx4mLsazPd+PbZSDiBZE3dvil+JY+64Y+jsaZQaAnDwPB8r8wrrXEl7qxFDsLu k3vaFwzq2l8J3uBEXqFHpnyfSbTmAi/wwaPcXz9HQNtDb/ofwuL92hY826NyRYk5/TSPJz3/Cf5 zZZVga8HxJ/6e7gUyoKgvTq8segUrVPSl8hA4RB8xJUqCijwq72qtbeEdXy/lAR6OSsMM+7Vnwh +QCfE0R1rI2bilmMY2b3WXB/wlo5yALqkj17R+lGx5sQfHz6c7PpKjXLcY0CVZ4sQRylsPqyP7N h3ulwIF3bwliS2ta0MwhWXsL2akQm+pD9e9uhISYhz77tohhMsNgPIKovYnBVmn00MbA5cXwtcF khK0yxIuZiFKRn83tlm9gbfYsmWLikeZAynWOWN29PZxZAXzmV1JNe+42tu9dkdRQLJP8ieQg6M r18Wzy1SCsOZon16fiA== 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-30_02,2026-09-21_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 adultscore=0 lowpriorityscore=0 malwarescore=0 bulkscore=0 priorityscore=1501 impostorscore=0 spamscore=0 clxscore=1015 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2609040000 definitions=main-2609300045 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