From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (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 60C043F7ABE; Mon, 17 Aug 2026 10:42:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.156.1 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786963331; cv=none; b=XfAfKYo4D9S77+5DYc6TZrjGCcRqzj6w/cv7iIvHiBnLsbQs/ize8xb6RIUH+zlXUvE5P7MlBewUJbEDAHztEamLlGCN0JXMplyXIXuw8uA/xDPgMGIait/eIkcZ0k6FpDx0QeLvlO6SS8sAyRqMPZyYs9bpvkHgqvAQzw0SYrA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786963331; c=relaxed/simple; bh=3IqfjXSRqMP8vlM8kPEKXt0UflhSM//ZlC7EUcYWa3I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZvLMBP530+OZfpvBQ3gtbrCqLMR93OaXtToNyphK+cN218OIPCzLpMSCBv7L9L77XNpwiM/Wmv3lCU98uifHzx3ug4x8nF/3gYI/p3BI7HpHFDO2GQkHXoed2bFCaHmxHs29bcXMQb3OimnE4QPvxxeE+IB/zOpYMePN1EkXwoA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=EOaWPNci; arc=none smtp.client-ip=148.163.156.1 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="EOaWPNci" Received: from pps.filterd (m0360083.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 67GLWC7g3685586; Mon, 17 Aug 2026 10:42:08 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=Oi4vgzrXQrl9u9e4e Q+tf/FqAwCq/JphzMRxx5kC/1s=; b=EOaWPNcivVHZB8BQYoS5HlX8DLfICbeL0 Ewd+iqxOxLdxSMeaXU8FrDTm8YDssJPrU2X4E9W/Ks+LZrJkRW0w7i0ro7/IXm2G AJlnA3gy0Ypl86E/bIzKSVIoIbzsPDY//E3ZsTaWqh23VE+cvPTybvJ0FCMKdDYu pQ6FAupwCVz/8fW+IJl53euLHgDFcjv3076QInzU2QzNaUjH0NIL353qk665yJXR bKhNmmN0gbR0U9riDTwG+dEzrrVV0Vymd9AtwL6Dwak/KRvHABXX54wx8K6WnJNq 46ydNS087RRXOZInL0lg1GS5kiQf5agDKsX+Azo9LkX9j8o143tIA== Received: from ppma11.dal12v.mail.ibm.com (db.9e.1632.ip4.static.sl-reverse.com [50.22.158.219]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4g2fm3ht36-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 17 Aug 2026 10:42:08 +0000 (GMT) Received: from pps.filterd (ppma11.dal12v.mail.ibm.com [127.0.0.1]) by ppma11.dal12v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 67HAfR2T013497; Mon, 17 Aug 2026 10:42:07 GMT Received: from smtprelay02.fra02v.mail.ibm.com ([9.218.2.226]) by ppma11.dal12v.mail.ibm.com (PPS) with ESMTPS id 4g354y5d75-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 17 Aug 2026 10:42:07 +0000 (GMT) Received: from smtpav02.fra02v.mail.ibm.com (smtpav02.fra02v.mail.ibm.com [10.20.54.101]) by smtprelay02.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 67HAg3OX48693562 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 17 Aug 2026 10:42:04 GMT Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id CCBFB2004B; Mon, 17 Aug 2026 10:42:03 +0000 (GMT) Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id AA6EF20043; Mon, 17 Aug 2026 10:42:03 +0000 (GMT) Received: from funtu2.ibm.com (unknown [9.111.162.247]) by smtpav02.fra02v.mail.ibm.com (Postfix) with ESMTP; Mon, 17 Aug 2026 10:42:03 +0000 (GMT) From: Harald Freudenberger To: dengler@linux.ibm.com, fcallies@linux.ibm.com, ifranzki@linux.ibm.com Cc: freude@linux.ibm.com, linux-s390@vger.kernel.org, Heiko Carstens , Vasily Gorbik , Alexander Gordeev , linux-crypto@vger.kernel.org Subject: [PATCH v2 2/6] s390/crypto: Fix missing scrub of temp buffers with PAES algorithm Date: Mon, 17 Aug 2026 12:41:59 +0200 Message-ID: <20260817104203.74033-3-freude@linux.ibm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260817104203.74033-1-freude@linux.ibm.com> References: <20260817104203.74033-1-freude@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-s390@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-GUID: PeTguGVw-aum0JLi4ccJWVaEYsiggoTl X-Proofpoint-ORIG-GUID: PeTguGVw-aum0JLi4ccJWVaEYsiggoTl X-Proofpoint-Spam-Info: AW1haW4tMjYwODE3MDA3OCBTYWx0ZWRfX1HqcnT6y+/21 Rhg+Ugb5JM1r2FKbd38MBQg3W1r9e+kyUSMCz8NSFh5+eNlnUBOkXrvGfi/sTyAjkvuBDtGqj7x gTBnfhscRCR3Sf12SviNJT+SGVgIdVw= X-Authority-Analysis: v=2.4 cv=WtQb99fv c=1 sm=1 tr=0 ts=6a82e580 cx=c_pps a=aDMHemPKRhS1OARIsFnwRA==:117 a=aDMHemPKRhS1OARIsFnwRA==:17 a=Sv0fKeRqtYgA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=iQ6ETzBq9ecOQQE5vZCe:22 a=VnNF1IyMAAAA:8 a=VwQbUJbxAAAA:8 a=zAJIOZ7HFibQgJ0wCBAA:9 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODE3MDA3OCBTYWx0ZWRfX1bcMiGs+MSc7 Wk/aMaoqlqDMbTiIuNZVSNCkR1EIr/pQZes78InBT4CitBOmZyzQW/S1meEv0dwIItC2dAKcggK I2EKfv7y69Gup5EkZ5sqHA6okTodYpHHktLytvGVbA+noQmWJVIgrdGCr5cp99BDTuWDJwxbjRN VAQb0X63ttyguuq2jOQYmCnpZ1reqqFtki1Z0U4q6reqe4v0VGsPKmM9NktNq0uwOLonQi8lA+N 0TbO5M/8s/F0laT4nXGI5QTRowouQMIt7y2QRbE4GUxvFpptaQFBvd7PRCLi8L1AdHe7pHUYppN 9z+89bSMjts5WyA0rmY1yWmlhhTnBX5kv9PoMIf4MYBjyWjLCyxaWzEjyrn/LBjygf7V+yfBmC4 HYZnLCUCf2w6KDnwcn6QnIymdIOSsvsZUlqCwYTHqnLJrbidBQee3iLPwTq4NKZHs+wM5+aOhzn 7yb49l+btaQte/3MH9A== 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-16_06,2026-08-12_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 spamscore=0 malwarescore=0 suspectscore=0 phishscore=0 lowpriorityscore=0 clxscore=1015 adultscore=0 priorityscore=1501 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608170078 In function ctr_paes_do_crypt() there is a buffer used to process remaining bytes < AES_BLOCK_SIZE. This buffer was not scrubbed and thus could lead to expose of unwanted data. Rework the code to explicitly scrub the buffer at the end of the function to avoid exposure of maybe sensitive data. In function __xts_2keys_prep_param() change the existing scrub to clean the whole param block instead of just the key field. Fixes: 6cd87cb5ef6c ("s390/crypto: Rework protected key AES for true asynch support") Signed-off-by: Harald Freudenberger Cc: stable@vger.kernel.org # 6.16+ blubber --- arch/s390/crypto/paes_s390.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/s390/crypto/paes_s390.c b/arch/s390/crypto/paes_s390.c index ccc7da106c3a..d075b0241f1f 100644 --- a/arch/s390/crypto/paes_s390.c +++ b/arch/s390/crypto/paes_s390.c @@ -1044,6 +1044,7 @@ static int ctr_paes_do_crypt(struct s390_paes_ctx *ctx, } out: + memzero_explicit(buf, sizeof(buf)); pr_debug("rc=%d\n", rc); return rc; } @@ -1377,7 +1378,7 @@ static inline int __xts_2keys_prep_param(struct s390_pxts_ctx *ctx, memcpy(param->init, pcc_param.xts, 16); } - memzero_explicit(pcc_param.key, sizeof(pcc_param.key)); + memzero_explicit(&pcc_param, sizeof(pcc_param)); return rc; } -- 2.43.0