From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.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 AC8C842F70B for ; Fri, 17 Jul 2026 15:54:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784303650; cv=none; b=ddt8eIpeeLNWI7dz8wNHV8ohHdUW4TrxdGx4E1s8xgW4zQYWlCYydpc9ZuxMTtEbAn1CQUmveeuYS5dKOX96TkA56Vwv0Dh1HhqiBaN6kDnZf64pJA2aeFfmfyJ7K9BD0HO/LiFz+DPXgJPHOWv6cM1a1tRRCzCS6RV3BWItMLQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784303650; c=relaxed/simple; bh=kG6GqPZEp+/IdHwaQrSkJh60hQWBLC9WceMGchytKzc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=njRTK1udslOpFNb/Bw0pfR1HPmaLrsgYS+ZKiQF3K65oSej7xXNeEfLk+Atj1F0F49HDgXbD5gt5bBcZGN5XyD+9IJkpOys2loq8HIVleHP7OIcdLdNu2xZa5Jsi5C0IPNB3u/IqWDsxsdpxvP10llJ5DGDQDUZ4SZnzr+W7nKc= 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=E2UQt0Fq; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=Z5e3KwUe; arc=none smtp.client-ip=205.220.168.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="E2UQt0Fq"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="Z5e3KwUe" Received: from pps.filterd (m0279864.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66HE7qs91675752 for ; Fri, 17 Jul 2026 15:54:08 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= BqAU3pbCskzec+/3Vw5PoL3sZolu37KpVmkDZNMLwlY=; b=E2UQt0FqU/dQl+3D mtlw5N1pMJ6qXmP9V24GqtMKZ7qm2mGkT0j6+u4hbHyas+SbY6niNDj+BMEVA/zJ lOz5yJTcFnOgORGzdZgtPfbZ1K0o8UVNc35r0DcNEbfA07WcSBvuE8rPlfAUrB1d yvHHq1WO2uONpp4yUyQyAogcGgw4TOHHOE0N8RHatOQeqtz4RxIE8mWgo79WrBBH v3XXYILHDqmkwLvKuxo02QNWuAgzNUY389/r8HJS1n0chMAS7ZpR0CdqnUKoalDZ X1i7Na/hb/n43g6m7ZiQcT76ZvRqaSh++Q4zft7vOIJiaEsBTfEPiIsPRoKpAjwx 2y5/Yw== Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ffj78sbcr-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Fri, 17 Jul 2026 15:54:07 +0000 (GMT) Received: by mail-qt1-f199.google.com with SMTP id d75a77b69052e-51c1d30035dso98802231cf.2 for ; Fri, 17 Jul 2026 08:54:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1784303647; x=1784908447; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=BqAU3pbCskzec+/3Vw5PoL3sZolu37KpVmkDZNMLwlY=; b=Z5e3KwUe/nCkETaxxpmkArDXw91N27DzXLEvTLNqj4PPATUgsghjB3Ij4ZjX1LFrfX uKCzvStGS0HOJoetGStvBZdKNcnA5lAVqw5Ioe2xMUCIBMfc/E95iCKgeuwQsQRQ06w9 4iaSTEhPOqsIlHjuwY24kBSfU0eTbr6hx4nyu3zmPXwd44OYemu8x6b5Lb5csL5+wm7h WN54TWuoKVIb3YBajJ1soy0RTQP+pIPVDsOgTMm11ammNwvz2ddtMzsoauclJ2Dsk3gz 1bFvuwY+2tIikDoh/n4b4mItkin9jObZHq3Ov+ySpfFZ2UTwL7bTq+XEzfV2l5g2MK4H EhFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784303647; x=1784908447; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=BqAU3pbCskzec+/3Vw5PoL3sZolu37KpVmkDZNMLwlY=; b=Pyo5OfpX3fw5lky0OZ6nSDucgWOevhkurfBG7BSQjIMlu7hfvtDGLd510G5+pN7Vqf Cx5PYNHs4ImOCq2lg0LU5rkUUEyxszmCQnq4JlE2l+gn7MZLr2ywiOoI5XtGg1Xt1lHP wWCAwV8YC/aOFKrQjPsdLI5BBAg3ek+z0TY/LtQlnl8fvwmHOXKP75ZcnkIxmqrnmvBm CrKCO8vnsayiWZ/PhJdxLg3Lhhi4tV/wpVxJ/QHd5+pSJGBtavtIceBJ3yLYbw6pdITn TuIwYecVYhL5JIwf7IaR5P2jIsClDKmNisZeJe0iVGaYLhtItP/4GM2XZFtKf/AjWWDP 86EQ== X-Forwarded-Encrypted: i=1; AHgh+RrI9dlvg42pguhKKaEfmswu03mM1bBvFcnyFIYjxN2nwZYRfNE6/JqBamlt+XXFfuseECay5HjRPcXoIvY=@vger.kernel.org X-Gm-Message-State: AOJu0YycP5Pb4a6AhhpIYj6v85/8+gYFurOU9qOqu0+ZhvXq0ODadlQq UmO5ob+Vp/fhUeGvm37jIhLbZqSIA/Cz9jWpbQ71voIxF1Ttzl3z9NHKBQuvc5lOiG/v6eEihq3 vFvnTgyjrLKvBBpL2nMnXepTCRHWX6puwG94sjiqrLL/bFqu6Oq7lSMJ8agu//Z4AzLs= X-Gm-Gg: AfdE7cm0cVAXBCxs/1mq3MGn7RbuBiySGl/c2i4EC08eNesH/wmHldDC2nUd2Vr0Sm4 nSix9kmKDTj01MugYdks1Yg+u5/tW0x4hw1oYcKr+k3FHaxeIkhfM3WHKKjidfF/JXhHBly30ma jsumVNtlPHzvJ3rDOIgAzCgkq14OVVAaMbkfME2CkEzQtNsJBwx/Ff9ghrbn/T730Cb8OMAvzUx HJ15nX3Y00ADe2XdosKo0CoWjSQ7wQBJLPtQJCTphUp5IeVoP9Vtzit92H9ydAN1g/W40xtz5Ka bhWJcMs5VNdplOgydarrOQ3M7ALpokdxK4OWdafvDeipFivD5aiO4gvOmIZTsKiitDmQC0Lt0IR 6gKSxn3nQnw2tXNI44YOeb8gjW7AvrQ== X-Received: by 2002:ac8:59d4:0:b0:51b:ff45:bc82 with SMTP id d75a77b69052e-5213daa1d49mr29753621cf.54.1784303646756; Fri, 17 Jul 2026 08:54:06 -0700 (PDT) X-Received: by 2002:ac8:59d4:0:b0:51b:ff45:bc82 with SMTP id d75a77b69052e-5213daa1d49mr29753311cf.54.1784303646252; Fri, 17 Jul 2026 08:54:06 -0700 (PDT) Received: from brgl-qcom.local ([2a01:cb1d:dc:7e00:dc44:5b1b:5396:79d6]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4954a2a2511sm47057095e9.1.2026.07.17.08.54.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jul 2026 08:54:05 -0700 (PDT) From: Bartosz Golaszewski Date: Fri, 17 Jul 2026 17:53:35 +0200 Subject: [PATCH v6 6/8] crypto: qce - Fix xts-aes-qce for weak keys 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: <20260717-qce-fix-self-tests-v6-6-455775fe5f6c@oss.qualcomm.com> References: <20260717-qce-fix-self-tests-v6-0-455775fe5f6c@oss.qualcomm.com> In-Reply-To: <20260717-qce-fix-self-tests-v6-0-455775fe5f6c@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=4152; i=bartosz.golaszewski@oss.qualcomm.com; h=from:subject:message-id; bh=aSgSggZNKFSkUSCkcp8Nh3YxGdWoKOMXm3+FN8YtSM8=; b=owEBbQKS/ZANAwAKAQWdLsv/NoTDAcsmYgBqWlANcIan0mYcl0bQ36zNm+24DZ6d1E7cMzGcL ZDK/XMAHHGJAjMEAAEKAB0WIQSR5RMt5bVGHXuiZfwFnS7L/zaEwwUCalpQDQAKCRAFnS7L/zaE w2lqEACVEKuAW9MOhdKzseFGSfB4mdWmYLoKC43REEe5ZxmHmHDJwCHxbqMzCMGFsF+WrYYstjw syeUn2+jyIPlp7r7KAZ0/afkO+nj7If/KqiwpCivbphzw2HNg9Xk4oDtUFs9CgjC2wssHK9ql0F 5KLVjqe52fEvGm8u0jzo5KhmEK5xbVDzIdjpDDpgNNU4Vhk+g5rQLSNt52g7g895PMLvPxaXW8X DaC6P7UhJ20arNUBKNDgSfJOpVpHVEfBSU3T7Z96Y8NRy5Pvc+Zuajzk7RrMM8ed4eDcRpz6IYH HKh7f2kvAi00YRE+qB6924GA8GbMyWBMqD9B34thzYqVJh+qW05bd2tEhVHJEEYiyEWjpIQS/4G WYmr4mjGcLv+g2y7GXWd3i2nJnXhH7R6fKSfXzO6ygrM0E7/aRVI5JUFVr5nBiNY7RgLifxKSdm BDrwE3c6GPgh62UiwSUpvkUPIhGDcNXizuUVlVbUrpnGakA0nfHphzN7K7Yrjle8tQUcz4H4hhj iM8EtdkiKOHbspetzwiodpDagLPPjuuE7Iyvrd26Lf8kAumuyfTcelBmHdZeRNh0n8mHevw5z7X 0aWXLaaDECOgg5F3QU4f2CJk4EhBaxHhYLDfPV8jJtzMFzvAHUiMTNd6eqVpREfFLVnQLdkmltn QIKTQwmlTiu0ycw== X-Developer-Key: i=bartosz.golaszewski@oss.qualcomm.com; a=openpgp; fpr=169DEB6C0BC3C46013D2C79F11A72EA01471D772 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzE3MDE2MiBTYWx0ZWRfXxzkMKOUTD8Cb +iFm/pdpayJmFSgPUoPmylRiX93Sy7/Zvmzo40hV+1eOGRusewxV2aBb7lQyU6TcjpGXjAQWJec JR82YVkliCPD7QTXm0W9aIHQ+9IYzBM0DAzoqL8IOTJvPy9ydQQaR5GdLSVNU3J3/tQfOhQnGL3 wCcqFw6UpUhzFq0ljI5ImjoHZjBsWUHynxad/ZifXMdCwIF+ymH+2ViechETziK+GYO20wmV0k+ 2qu4V2+PIT6xd8pTaHFwkm1tfCceT6YPrt0NsFxSSWgQA3jok0Y5h98Emg2GbQEDMzIPggmfBu5 arxZzEupNpbnkRx4Pqc+q6jEWVeo4Q9S+srlMYrRhFI8CSiHAtb+3YrlrB97XbmbD4IigFcAiiu yz2gmtR2Tp5KaNOg4gEdmz2s9n4sDGSVCQ2u2oQIn0x1JtxlMdd/XI/Cah/18Cm5AbuMb2g8vnN /jPnXhcUKs4ZpydlxEQ== X-Proofpoint-ORIG-GUID: iawHYBNiuMqzk3-W-nok9Y-EOzB1FP2Z X-Authority-Analysis: v=2.4 cv=U9Ciy+ru c=1 sm=1 tr=0 ts=6a5a501f cx=c_pps a=WeENfcodrlLV9YRTxbY/uA==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=RAioF0-LDSMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=DJpcGTmdVt4CTyJn9g5Z:22 a=EUspDBNiAAAA:8 a=VwQbUJbxAAAA:8 a=tpKvEUOkdOp8HkJiz7sA:9 a=QEXdDO2ut3YA:10 a=kacYvNCVWA4VmyqE58fU:22 X-Proofpoint-GUID: iawHYBNiuMqzk3-W-nok9Y-EOzB1FP2Z X-Proofpoint-Spam-Info: AW1haW4tMjYwNzE3MDE2MiBTYWx0ZWRfXwuGkvRoWkuDj lrttQ6DIUIs3C+nr67CP8eCnuuAe0fntbLuk3UYCVfH+wTxoC1DiS94gH5CZ3Q0+8zN4xEIAU8x JeHpnU98MEGdrH7uuyhZ5w5Mhfy7Sw4= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-17_04,2026-07-17_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 suspectscore=0 phishscore=0 spamscore=0 lowpriorityscore=0 clxscore=1015 priorityscore=1501 malwarescore=0 impostorscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607170162 From: Kuldeep Singh The QCE hardware does not support AES XTS mode when key1 and key2 are equal. The driver was handling this by unconditionally rejecting the keys with -ENOKEY(-126), regardless of whether FIPS mode is active or the FORBID_WEAK_KEYS flag is set. [ 5.599170] alg: skcipher: xts-aes-qce setkey failed on test vector 0; expected_error=0, actual_error=-126, flags=0x1 [ 5.599184] alg: self-tests for xts(aes) using xts-aes-qce failed (rc=-126) In general for weak keys, - If FIPS mode is active or FORBID_WEAK_KEYS is set: return -EINVAL. - In non-FIPS mode, Accept the key and encrypt successfully. Since QCE was returning -ENOKEY for non-FIPS mode whereas the expectation is to encrypt content and return success, the selftest saw a mismatch and failed. There are two problems in QCE behavior: * -ENOKEY is returned instead of -EINVAL for the FIPS/weak-key rejection case. * key1 == key2 is rejected even in non-FIPS mode Fix xts-aes-qce behavior by using generic helper xts_verify_key() to reject keys early with -EINVAL for FIPS mode active(or FORBID_WEAK_KEYS set). For non-FIPS mode, since QCE hardware cannot accept the keys, use software fallback mechanism to encrypt the data. Cc: stable@vger.kernel.org Fixes: f0d078dd6c49 ("crypto: qce - Return unsupported if key1 and key 2 are same for AES XTS algorithm") Signed-off-by: Kuldeep Singh Tested-by: Kuldeep Singh Signed-off-by: Bartosz Golaszewski --- drivers/crypto/qce/cipher.h | 1 + drivers/crypto/qce/skcipher.c | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/drivers/crypto/qce/cipher.h b/drivers/crypto/qce/cipher.h index 850f257d00f3aca0397adc1f703aea690c754d60..daea07551118d444d2f749588bdfe2ae2c6c553f 100644 --- a/drivers/crypto/qce/cipher.h +++ b/drivers/crypto/qce/cipher.h @@ -14,6 +14,7 @@ struct qce_cipher_ctx { u8 enc_key[QCE_MAX_KEY_SIZE]; unsigned int enc_keylen; + bool use_fallback; struct crypto_skcipher *fallback; }; diff --git a/drivers/crypto/qce/skcipher.c b/drivers/crypto/qce/skcipher.c index 4779218d4f33a07331c510abf0d6d23e7e70d102..3df583b1a56ec371e556fd00e7930d9fc4447ce0 100644 --- a/drivers/crypto/qce/skcipher.c +++ b/drivers/crypto/qce/skcipher.c @@ -12,6 +12,7 @@ #include #include #include +#include #include "cipher.h" @@ -194,14 +195,17 @@ static int qce_skcipher_setkey(struct crypto_skcipher *ablk, const u8 *key, if (!key || !keylen) return -EINVAL; - /* - * AES XTS key1 = key2 not supported by crypto engine. - * Revisit to request a fallback cipher in this case. - */ if (IS_XTS(flags)) { + ret = xts_verify_key(ablk, key, keylen); + if (ret) + return ret; __keylen = keylen >> 1; - if (!memcmp(key, key + __keylen, __keylen)) - return -ENOKEY; + /* + * QCE does not support key1 == key2 for XTS. + * Use fallback cipher in this case. + */ + ctx->use_fallback = !crypto_memneq(key, key + __keylen, + __keylen); } else { __keylen = keylen; } @@ -262,6 +266,7 @@ static int qce_skcipher_crypt(struct skcipher_request *req, int encrypt) * needed in all versions of CE) * AES-CTR with a partial final block (the CE stalls waiting for a full * block of input). + * AES-XTS with key1 == key2 (not supported by the CE). * A payload fragmented across more than one scatterlist entry (the CE * stalls waiting for input in that case too). */ @@ -271,6 +276,7 @@ static int qce_skcipher_crypt(struct skcipher_request *req, int encrypt) (IS_XTS(rctx->flags) && ((req->cryptlen <= aes_sw_max_len) || (req->cryptlen > QCE_SECTOR_SIZE && req->cryptlen % QCE_SECTOR_SIZE))) || + (IS_XTS(rctx->flags) && ctx->use_fallback) || sg_nents_for_len(req->src, req->cryptlen) > 1 || sg_nents_for_len(req->dst, req->cryptlen) > 1)) { skcipher_request_set_tfm(&rctx->fallback_req, ctx->fallback); -- 2.47.3