From nobody Tue Sep 29 13:19:51 2026 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 B516A388371 for ; Fri, 7 Aug 2026 06:55:04 +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=1786085706; cv=none; b=aD6D7C12Ii8jQWAGMfG6gosnfM4q3yv7n7ht8A4rNs/vWkGX0l3ROTj5coZYRnzHEhOw34k4MJKZwm8jd9exKzLI6C7gYBodv6eQVDqxecTVope0fXx1La3wEeKxZl7lc4DdkThc/o9yz6Cregu1LRLlEIfRiqYANmwA5JwlNrM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786085706; c=relaxed/simple; bh=m20Kh+H5fTlZZTfVLpqUKggHmNyF1hCcSM91TM5eEDQ=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=Omy9+A9tkzKrCzefmqKsiCwg7L7AiDPvoXKQw+sZHIe4Y9bEZPQBsn6FBsJBR/ToX3laxmmAb6O7UIxn9cvmzbNc0+TYavnoaGaY7SUzAxl+UVxG7Q6keWBWlv8bok2e0iA1DqRhc0lS43BUkQoEYxR9DMMJTf3XvyCCRQb9KpE= 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=LoPe48Ha; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=GnVl6nbv; 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="LoPe48Ha"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="GnVl6nbv" Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 6770GpUS3477199 for ; Fri, 7 Aug 2026 06:55:03 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:message-id:mime-version :subject:to; s=qcppdkim1; bh=Kwl3nXu9nwinBsOKeAAPgUZwJmzbHnalLoK uzJgJHQ0=; b=LoPe48Haz7AG5AKKt+S4Qupq9tKhEVkTfG7eM3nddK0mqUB+Wfh +0ime4awFgP5mlfwjSvX6GT6krGOjVW4uuc3hED397RQ25k+ui6UH/ecy5sFBUfz MK/BX97B5QTx+NRXkJeNXLa5qTcVFb+ODWie/LwGIo3vl/jSmw4tXw+u7NQkFWnO 7JcdZ6259ch30gEz/aWYfCM7azVCTgxV2a5OJuUAAgHZK3rUZvbfqWEFsXGvANBt OxSPCCs2BRsMtInQf9S0uCzmWcg5ogoVZKxdIcXBegszYBgXOiV6RnZUm0gj59y0 9Gwwd6selKKv02Q4EN6LdAdHqMdMTaadzMw== Received: from mail-pg1-f198.google.com (mail-pg1-f198.google.com [209.85.215.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4fvy6hapbb-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Fri, 07 Aug 2026 06:55:03 +0000 (GMT) Received: by mail-pg1-f198.google.com with SMTP id 41be03b00d2f7-cbb467e56aaso3289924a12.1 for ; Thu, 06 Aug 2026 23:55:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1786085702; x=1786690502; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=Kwl3nXu9nwinBsOKeAAPgUZwJmzbHnalLoKuzJgJHQ0=; b=GnVl6nbvh2YjYme901pG24BDvzhJkvXDyDdDIHEF2WwEznod8/dS/GH01aJFdk/qpE bxc2OERdhFMEzQLaufWSgTcq2F+eWa8nHhcDnpK+NTKVkUKZsBZgbQ8muWgN+zgMIKTZ ua0ECXshfPgCfPXEhIG4y8DyO1FGs7LllSgAI4A565EUDQSxXmx5grqmJ6nBJaY+ShaK X7EAZB7evjNG4KJXjbmce5yTt2L8MJX2T6SJk2c1s6E1VUfd/vuffBd2hGTcs2y9azAf APEEQhyfZy1aRZP0YkRYVULje/mOZbY4yvKLnNJkdvYO5KSF29S4SVMH9DSs8OramZ8r cRng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786085702; x=1786690502; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=Kwl3nXu9nwinBsOKeAAPgUZwJmzbHnalLoKuzJgJHQ0=; b=l1mayovva5ASxRS2jwiSw9mWTxMeeQpxn/Rp7KZPxHx/hQ7M40qNFYEa2zsLK9K8dF SXKc9K3yJJKGTSC1GFY8aoggy19O3E/TR9LUMmMGWeLfaRgD4kEjav8r4UeN7SLfFdV8 7IqVZcmEseqTJPNgsQ5zT+Xq1uxMEw7yIk+rdWpALSftoPCYbUioN3HAMwxTGX8Ktgv6 UyhkbiV3Mar/EbrkLFCW1UNpaxYs3b4Z9bVH2tDFJukXn9YSNTMFyxkDr+UdHK/cv8O8 KxE5IhZeYNf+gmIlaYRUPRg32MfcAqZ5smENSyaPQbIyVUYzhZKgv3V08PqFDPxaGZR1 yffA== X-Forwarded-Encrypted: i=1; AHgh+Ro6o9myxrzyJuTawyTQiXbPgX8MLnfYFW11HcX1mMuSf2REppUG1CLHERhXHQ8Yh/fnOVXR9zzdpiSMa04=@vger.kernel.org X-Gm-Message-State: AOJu0YyuUFqAq/1tpkajVTVEa3TysRoikTH1sJEfexbd0tz1PJDbVsof 66iRnb3cpuhX0bdFQ89UKUEing9FnWGztrIbppgBfA9HmZhcXdxwsfevdvjTdby28FDo26AbVVz Go0wHob7mTsGI2M7XaBXkHvvj9zOcgR7sguJ+yabQaoetSOHpYNHBKv9dOhAA7KlKupM= X-Gm-Gg: AR+sD11pjto7u9zMqGvuOoXdKlJ5YkVqaq+BmuPcDKxY8JzJWBk0wOfsEBBPtU8WSIZ kX3PYktMknmaj44HZaxKPLaiRifYo8aJAOenoDAIVlU6KaUItKSqTLJ/coHfV6a0tjdXlItwqYP Gc8Givnae0cd1bTY6v//JF7qr+NrRtyTeDDu6RoBpaX38YzO1qXqOxPFaDM4IHTAE/Qa6TKeZQ/ Pk4OBqt2zr+0PCeHm25YEoZGBvX4T2C1lDozMC83u4ZhHHByFA20FEINdHtR5UKTt27nSPdNkue t/hRXzayD+iwp5eCq25tkIN07TLzg9EN3JABNJATlXaAlPbwwhGxg61PFC74mDPwb00fpoNrll7 DgM2Nbp2XJThF2TAxZ0ffCe2HmR+gE+vkFImJybf8oY2BmsoXHn8woal/P/4vZDgasteQFgOQ4A sjmSsl3iCh4Kk= X-Received: by 2002:a05:6a21:6e92:b0:3c6:61c6:8970 with SMTP id adf61e73a8af0-3cb85df2778mr29200666637.14.1786085702560; Thu, 06 Aug 2026 23:55:02 -0700 (PDT) X-Received: by 2002:a05:6a21:6e92:b0:3c6:61c6:8970 with SMTP id adf61e73a8af0-3cb85df2778mr29200425637.14.1786085700148; Thu, 06 Aug 2026 23:55:00 -0700 (PDT) Received: from hu-mdalam-blr.qualcomm.com (blr-bdr-fw-01_GlobalNAT_AllZones-Outside.qualcomm.com. [103.229.18.19]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-14101b95b20sm4064525c88.15.2026.08.06.23.54.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Aug 2026 23:54:59 -0700 (PDT) From: Md Sadre Alam To: brgl@kernel.org, herbert@gondor.apana.org.au, davem@davemloft.net, thara.gopinath@linaro.org, linux-crypto@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: varadarajan.narayanan@oss.qualcomm.com, md.alam@oss.qualcomm.com Subject: [PATCH] crypto: qce: fix CCM AAD buffer underallocation Date: Fri, 7 Aug 2026 12:24:54 +0530 Message-Id: <20260807065454.1640815-1-md.alam@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: 4sTHi14Tqxi96d7XhfrvjEiXj4R1DqSs X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODA3MDA1MCBTYWx0ZWRfX4M+r1jEpBbnO Vwl17gVCT/mS+wfQD1zge7i/X4NIjMz9YdVmhIk9Awhqhtb30x8OXun1x24xT+LFvSN9ntXBAlw QRj39GQ/EM8npi5DoK0S9roxHG3h1H8iNXbqghbQHbU0moABdi+mLQZoGvWVZo1nGQKIARqKwUx 7P6X/nSiyk9FbZ0WIiFCTn4dOlp3WEquzbjql9zK62aShM4vycN9VYJpFlo+7JicvHni4EssJUM 6L3rO3gg9o+lh96js57LCNe7/wK+rXNMt60+M+SYke8R+JLESjM60h5Ja1dVTLFFCuJ464sep+S GzaCO9Tjnshwc0QEc6y2Wg/J14FfOVdgGa9dz7Tbe0kfQHkDQ5X1v4Zgw4wA6G+hJEIui0zWQ1t 8W/DJ35/ks39HO5zD/Uwypmw36xL7JRzd5qRsJSsyZsNr2txxm2dqoQmLzkYD1f43Fz9MKoQCj/ UtQIg05BM18PpNVJFFQ== X-Proofpoint-Spam-Info: AW1haW4tMjYwODA3MDA1MCBTYWx0ZWRfX6HSNUCkymMT2 NgXNQ+Ix/2kTcr8X70RInwY2qPTXGxyVAB6i/pmdBQVjGMPq3CutzmzqBiALrnDGUyzdjJLmAv0 M9Lj2bs9ULt6NepGqeYj1WSmJ0+owR0= X-Proofpoint-ORIG-GUID: 4sTHi14Tqxi96d7XhfrvjEiXj4R1DqSs X-Authority-Analysis: v=2.4 cv=MbpcfZ/f c=1 sm=1 tr=0 ts=6a758147 cx=c_pps a=Qgeoaf8Lrialg5Z894R3/Q==:117 a=Ou0eQOY4+eZoSc0qltEV5Q==:17 a=Sv0fKeRqtYgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=ZpdpYltYx_vBUK5n70dp:22 a=VwQbUJbxAAAA:8 a=EUspDBNiAAAA:8 a=8zGforoG6dPd7syO8-wA:9 a=x9snwWr2DeNwDh03kgHS:22 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-08-07_01,2026-08-06_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 adultscore=0 priorityscore=1501 clxscore=1015 malwarescore=0 bulkscore=0 lowpriorityscore=0 suspectscore=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-2608070050 Content-Type: text/plain; charset="utf-8" The AAD buffer allocated in qce_aead_ccm_prepare_buf_assoclen() can be smaller than the length later programmed into the DMA scatterlist. The allocation size is currently calculated as: ALIGN(assoclen, 16) + MAX_CCM_ADATA_HEADER_LEN while the DMA length is set to: ALIGN(assoclen + adata_header_len, 16) Since ALIGN() does not distribute over addition, the allocation can be smaller than the DMA length. For example, when assoclen =3D 32 and adata_header_len =3D 2: allocation =3D ALIGN(32, 16) + 6 =3D 38 DMA length =3D ALIGN(32 + 2, 16) =3D 48 As a result, the QCE hardware can read beyond the allocated buffer while computing the CBC-MAC over the associated data. The extra bytes are folded into the authentication tag, resulting in an incorrect tag and causing CCM self-test failures such as: alg: aead: ccm-aes-qce encryption test failed (wrong result) on test vector 8 Fix the allocation by adding the maximum possible AAD header length before alignment: ALIGN(assoclen + MAX_CCM_ADATA_HEADER_LEN, 16) This guarantees that the allocated buffer is large enough for the fully padded AAD data for all supported header sizes. Cc: stable@vger.kernel.org Fixes: 9363efb4181c ("crypto: qce - Add support for AEAD algorithms") Signed-off-by: Md Sadre Alam Reviewed-by: Bartosz Golaszewski --- drivers/crypto/qce/aead.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/crypto/qce/aead.c b/drivers/crypto/qce/aead.c index 92d84941d3db..a9642c67f476 100644 --- a/drivers/crypto/qce/aead.c +++ b/drivers/crypto/qce/aead.c @@ -196,7 +196,7 @@ qce_aead_ccm_prepare_buf_assoclen(struct aead_request *= req) /* Get the msg */ msg_sg =3D scatterwalk_ffwd(__sg, req->src, req->assoclen); =20 - rctx->adata =3D kzalloc((ALIGN(assoclen, 16) + MAX_CCM_ADATA_HEADER_LEN) * + rctx->adata =3D kzalloc(ALIGN(assoclen + MAX_CCM_ADATA_HEADER_LEN, 16) * sizeof(unsigned char), GFP_ATOMIC); if (!rctx->adata) return -ENOMEM; --=20 2.34.1