From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (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 A69A1481643 for ; Wed, 17 Jun 2026 15:50:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781711419; cv=none; b=CZnRI6qUv0xfLBu8u7zmi4DizxTvaffv/cWiHkTc9d7ttfSYWi5A02eL1c4zk7VxOS3Y90TA0uqDbmd2DCTISFUfK6da8ZIdyeolQpfBEhW83jwPMII3NrBMgO6ysEe+JurLc6Yb2tbSK+/F2ZoCkBPsZIFaJQHOO/QHb76NIzo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781711419; c=relaxed/simple; bh=YiYddfFRcomI7t8tYpClLcoAljSpal/h2mq4K2cDM5w=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=XD69pI/GaX5XZJHtr0XZ6trmBDJhVitcWislaZexin1RYoHMbOUirj+8mES0yGp1pxo3YM1AOsoKHYmf7Nq4WTgeA2CW34yqh3Z8HGW0wno1Sj5cCjM+lFVeK0tim+w4pZi0GV51EjAYnL1qxBY4F7TxXn17obGctR4jbVWwWgo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=AebN8p87; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=j7mz/o3F; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="AebN8p87"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="j7mz/o3F" Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 65HFPRXm3157255 for ; Wed, 17 Jun 2026 15:50:02 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= 3rQd7KVwEFxeS6KtLGp+38aVdnF8Lr3UIX8ph6skqaM=; b=AebN8p87qUOC8F+D jArpuVFZ0zGpMEjcDAoOaBNH2MTJd8pRzY9RvrxqDnkyUDUBzkcxV9+pXEKO1rju CRAIB49Wk5Ffb8LL5jQTiF0RqXCP9xoMQY452b9+yD6TAM7BLj/flMfrAbdLfIT1 RsMQr749w/4dpe52HdsclWWk5ZBuB1PiiAc8+3JeXcWwq041YDSSE/PvVS+1SBwL Qj9yjOG7Bb8kT3ckodxvfhvphn8XRCXpdySbEBpbwpL6cKWt8QKx2q7DP4FsDYj/ tyRkDP1UdpIulpicnJHeZZkh3dv47SgzqefKRux3vm9llHsRtg0Nj79o9oj+Mrxu G6Gnjg== Received: from mail-vs1-f72.google.com (mail-vs1-f72.google.com [209.85.217.72]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4eueerc2uf-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 17 Jun 2026 15:50:02 +0000 (GMT) Received: by mail-vs1-f72.google.com with SMTP id ada2fe7eead31-6cf37fe12faso2207286137.0 for ; Wed, 17 Jun 2026 08:50:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1781711401; x=1782316201; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=3rQd7KVwEFxeS6KtLGp+38aVdnF8Lr3UIX8ph6skqaM=; b=j7mz/o3Fn3C2fmasabt3KcfamRFd+cZ/9Yybz27YeF4EaNc70PFyZK3GYFudrMGVb4 Odm2H6WXNFvFRIixtcDraRHc0ESFnurtIeVlys16o1QD40+Qt0QIHO4sCHEqxRO+uuvW KIm1IlCkrlxOXcjOKBBEv+BZ1dpm9199YqH3vijzWkIbRztVKZd9kOO53JjwDQQu2w8W 9J5jFjSKvOM6SIPxnLmc14SPxHuW8fKHSE7RhUgNEsz++HCNxadNXjg2cBett3/VndWg cJLhfPfEXvLr3h3x+3j07dlt0HimcmxcBnq/0xivTsKbjdEcDDOFRp4VvLijL0oRurn0 U5gg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781711401; x=1782316201; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=3rQd7KVwEFxeS6KtLGp+38aVdnF8Lr3UIX8ph6skqaM=; b=VREKB86foAjUmbjNcoyWUgw3uY1Q3TyWmhOEPfI+PLuuhp+AUeeI5KOeQPw4wNTPIH RVObswNSOCpGMKQgJhp/uoeHJ9D86C6eHLMaNDNgWUL54MwFPjYDAQ7ZFQsQBjrYP+qX /DmW8Y7qkwruSnTuV6juPS1atH06XIgimKx5hABmcDHPoFIHQ/0ragFFQS7nMVs4meZl ebydZ40Fus1K4x70ZbD68rw85wm4WbqKvYSrnzxAjB4Rf1iYZvYc7doxnBylL0oha0PD gdiW5bsAcwW9EM84nSzl66x9cWI/C7JMFiB2thw55wpjrtAqqyJPDL5mhaHkB9fL17ah qQig== X-Forwarded-Encrypted: i=1; AFNElJ8iMyOWxkDHHEUMCDTY5bfmvYo/T+B/A6kD2dOVisXcVGEdaQtUp4TrfsxbqH/bhuoyOiw50B+Xd5uH/g0=@vger.kernel.org X-Gm-Message-State: AOJu0YxBZgQUbSfqcqii7/5elwwN+hlfHS2a4+CnR2ThZ7SMd9X6ZL9Z qIddYdXKx8SZtpyx2HDgg5tmlAJKq/IdxySvTnWgRYe0AsGl0gCwacUnSyGmlw377ddggTrQ66f cbsWNiSbfBA9a/XCP0UMZQobc5kl1MQF421BNahsBeIDkzUS8rxchNLsXspi1bJE1RO4= X-Gm-Gg: AfdE7cmxKZtLY26/T/UxbQX62qEWZ3yEKe4on7UgzKdhsGHHdBEPxm363ADvg2tUILe LBqA2fpWHOb8s8TcjuiaLCZwSOGkkzrHYco2HyxSnGjvW8nVBj+tOlbZulaQFmSK1cLmrpcuVvm 7mj5QbxrU7NRkdLgg0wNECIgLLT1gV+I4KsrnGMLIN1gEx6qQjOsdsG1XwpJxdtHtBZAiplJjMU U957OaOvUt0xMhQaB92aJclysOizRH9RtFqnb6uJoZYmVQH7heQ/3IoC8i2NlXA+ml7vCpLmedH gxhkehRQWeK13Pdh1aiey56Jvt5BZ12ZyZnzpe1aadqqxzra7DhfYfDbObEKWDB4NIwWwxQVmVN BFw80nYDlxM9rrl4aKWcfunjOFFdOm0W3wdXd/qXz X-Received: by 2002:a05:6102:4485:b0:608:94e3:bd89 with SMTP id ada2fe7eead31-727c4a9785amr23050137.1.1781711401575; Wed, 17 Jun 2026 08:50:01 -0700 (PDT) X-Received: by 2002:a05:6102:4485:b0:608:94e3:bd89 with SMTP id ada2fe7eead31-727c4a9785amr22994137.1.1781711401046; Wed, 17 Jun 2026 08:50:01 -0700 (PDT) Received: from brgl-qcom.local ([2a01:cb1d:dc:7e00:c856:25e5:e249:5e0f]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4922fa8b423sm168913195e9.11.2026.06.17.08.49.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Jun 2026 08:49:59 -0700 (PDT) From: Bartosz Golaszewski Date: Wed, 17 Jun 2026 17:49:33 +0200 Subject: [PATCH v3 4/8] crypto: qce - Fix CTR-AES for partial block requests Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260617-qce-fix-self-tests-v3-4-ecc2b4dedcfd@oss.qualcomm.com> References: <20260617-qce-fix-self-tests-v3-0-ecc2b4dedcfd@oss.qualcomm.com> In-Reply-To: <20260617-qce-fix-self-tests-v3-0-ecc2b4dedcfd@oss.qualcomm.com> To: Thara Gopinath , Herbert Xu , "David S. Miller" , Stanimir Varbanov , Eneas U de Queiroz , Kuldeep Singh , Eric Biggers Cc: linux-crypto@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, brgl@kernel.org, Bartosz Golaszewski , stable@vger.kernel.org X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3240; i=bartosz.golaszewski@oss.qualcomm.com; h=from:subject:message-id; bh=9aUehWqDrOE94Ytvg0cUqYrxCF3sTZEZbyMZOkshb98=; b=owEBbQKS/ZANAwAKAQWdLsv/NoTDAcsmYgBqMsIZWaFdop4gRxQxjV4jFV8mK3CxAmVawDFqX Re0lyNxSfuJAjMEAAEKAB0WIQSR5RMt5bVGHXuiZfwFnS7L/zaEwwUCajLCGQAKCRAFnS7L/zaE w86FD/4g6WxEvyQ0RMQbkAhrhnloiyeEsJij47lNWZwmM2S1TB/eQLGWcF50H8gTvAkisHiG+kw 3+K/hO+KDhnncidlJpnQcNTS0ZuTSk0WPA1mFkGm4HMQrjBY4aWGHK8BZeRZP/mxIYQe1zTJrvY iW3DhBmdQBu2sc81VwYPhiW+R3YkLRgpWtNz5W+g8U2deg7Se22MDbZ6gBk85R6mjVz0N1kqhvN aAfIGmkuxGcAeCW+YdHNK373eE4GHL9Sl39KjR9z/6FN0t7R3SO+oc8jo1g+m5Y4QTyqM95+2FJ 6BYRY5ZoHfmc3+k8+LP1js39DIh7foLQm6KrSlsaK2fcK9gtWWpePDwA2ba25ubJdiNsAPbN/g5 5P5GoMs7sZdhSuZ1JsSgHw0nPke0ZEh+flwVguj/jFyEpq1C8yKVtyK5J3yjhFY/GYTa3AoD9o+ st1nCphI1z7J4GMu7Xr0KcdsjF7UbxDOwWhfYhqR+py/djEfLNPlg7AKriRHy7ChCEYw6Vy5mpI 5BvFNWgFSgA/O/Va6c0EgROa5jgT+HRuqK0xVAR9trdKwRDNVmR63nUHQJKz7DBkLGGBZ+56/7E f9AXt7eY6TYR+/TLubVlhlndfGlDSRMcdjsEc9/9wNuVgikq4cMS+TsDsfDF5xmAbBfpKYLkjfU KqjVUkdaQHoD0IQ== X-Developer-Key: i=bartosz.golaszewski@oss.qualcomm.com; a=openpgp; fpr=169DEB6C0BC3C46013D2C79F11A72EA01471D772 X-Proofpoint-Spam-Info: AW1haW4tMjYwNjE3MDE1MSBTYWx0ZWRfX1g1OBk6diGvc mVe59RCEB1suaujyzBTC2NdzWQqa+VzY0I61/BEi3oqULiNuGUE4+U7hdU9AHQlHqRn3wKS3pbb H8qosBc6oHBrNRFzjrevFX2qC3AAACE= X-Proofpoint-GUID: VL6LjK2yJZ5JXGsZrAXtwp9EtrGEKWpP X-Authority-Analysis: v=2.4 cv=d4fFDxjE c=1 sm=1 tr=0 ts=6a32c22a cx=c_pps a=DUEm7b3gzWu7BqY5nP7+9g==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=rJkE3RaqiGZ5pbrm-msn:22 a=EUspDBNiAAAA:8 a=VwQbUJbxAAAA:8 a=Y2NcAOke46LZopEJyX0A:9 a=QEXdDO2ut3YA:10 a=-aSRE8QhW-JAV6biHavz:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjE3MDE1MSBTYWx0ZWRfXz7+dZoXRWmf6 AQUe4xIiBoNgHrkqOd1ua+ygCyQGlByilcmSduRow0u6XjSxIZK/BJIkGNek3xPTEXzC04Pawxf xSPxEZN1I5JqyT9F6i3CPAKmxEFuVsR8aF5oRwrMRATsNaaKTTl2lgxkWH2HY3ULgnBxcSLCAOx PuCz/uiq+T1iyxhweQgk/ticG7oIxJmPyZFiahq5OU2iZoKBapo1eLEozE+LrkLVoXAs6YwHD/t PZNoU0/tZx3VSQ5s2xDmZ+q20eYX62l65kWd4ztjERhoILvmSuWNkAy5oGYVpZyjUqcMO1+l/lf SayjTiRN3w3xbTb4g5hlu/f2qJT4blFUvwkSgPRRx5qYSuQyS2rRbWaTFhH6idf+7MpS45QBbw6 H7k1inwBbX6qI+8TLIdIPaAsTPRc9Y+ln9IubfB+qqgdaphGswNA+bNI40SqrZiliyEreZ8Ntqc J2SO3K/Soi3YoswyzcQ== X-Proofpoint-ORIG-GUID: VL6LjK2yJZ5JXGsZrAXtwp9EtrGEKWpP X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-06-17_02,2026-06-17_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 suspectscore=0 malwarescore=0 lowpriorityscore=0 phishscore=0 bulkscore=0 clxscore=1015 adultscore=0 spamscore=0 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2606170151 From: Kuldeep Singh In CTR mode, the IV acts as the initial counter block. APer NIST SP 800-38A, after a CTR mode operation the next unused counter value is: IV_next = IV_in + ceil(cryptlen / AES_BLOCK_SIZE) The skcipher requires req->iv to hold this updated counter on completion, ensuring chained requests produce correct results. Referring to Crypto6.0 documentation, Section 2.2.5 says: "The count value increments automatically once per block of data (in AES, a block is 16 bytes) based on the value in the CRYPTO_ENCR_CNTR_MASK registers." QCE increments internal counter register once per full 16-byte block(for ctr-aes) is processed. In case of partial request length, the hardware uses the current counter to generate keystreams but does not increment the counter register afterwards. So the counter value written in CRYPTO_ENCR_CNTRn_IVn later once read by software is one less than the expected value. Crypto selftest framework capture this scenario with test vector 4 comprising of a 499-byte payload (31 full blocks + 3 partial bytes). Error: [ 5.606169] alg: skcipher: ctr-aes-qce encryption test failed (wrong output IV) on test vector 4, cfg="in-place (one sglist)" [ 5.606176] 00000000: e7 82 1d b8 53 11 ac 47 e2 7d 18 d6 71 0c a7 61 [ 5.606192] alg: self-tests for ctr(aes) using ctr-aes-qce failed (rc=-22) Expected iv_out: 0x62 (iv_in + 32) Obtained iv_out: 0x61 (iv_in + 31, partial block not counted) To fix this, just increase the counter value for partial block requests by 1 and for the full block size requests, don't take any action as expected value is already returned by the hardware. Cc: stable@vger.kernel.org Fixes: 3e806a12d10a ("crypto: qce - update the skcipher IV") Signed-off-by: Kuldeep Singh Signed-off-by: Bartosz Golaszewski --- drivers/crypto/qce/skcipher.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/drivers/crypto/qce/skcipher.c b/drivers/crypto/qce/skcipher.c index 459c9ba6d0a5363da9f6ac8c69b6d3c1a4633f91..ace64a651f56ff478bb4966d74c9e762ade37ba3 100644 --- a/drivers/crypto/qce/skcipher.c +++ b/drivers/crypto/qce/skcipher.c @@ -33,6 +33,7 @@ static void qce_skcipher_done(void *data) struct qce_device *qce = tmpl->qce; struct qce_result_dump *result_buf = qce->dma.result_buf; enum dma_data_direction dir_src, dir_dst; + unsigned int blocks; u32 status; int error; bool diff_dst; @@ -56,7 +57,21 @@ static void qce_skcipher_done(void *data) if (error < 0) dev_dbg(qce->dev, "skcipher operation error (%x)\n", status); - memcpy(rctx->iv, result_buf->encr_cntr_iv, rctx->ivsize); + if (IS_CTR(rctx->flags)) { + /* + * QCE hardware does not increment the counter for a partial + * final block. Increment it in software so that iv_out + * reflects the correct next counter value expected by the CTR + * mode. + */ + blocks = DIV_ROUND_UP(rctx->cryptlen, AES_BLOCK_SIZE); + + while (blocks--) + crypto_inc(rctx->iv, rctx->ivsize); + } else { + memcpy(rctx->iv, result_buf->encr_cntr_iv, rctx->ivsize); + } + qce->async_req_done(tmpl->qce, error); } -- 2.47.3