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 88ED433F588 for ; Mon, 10 Aug 2026 14:17:28 +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=1786371449; cv=none; b=ExVeYrMTSNzTclsbszhrlvPwrqjNOkHigJ27m+oAiYQU3e2W7gfzxEB3unwyGv9wRe1nheQC0LRxtj9w/dAtCCykYXBInru7APecE+8qt/in6cQdYagXQTRCamFQof6w/EU0raPnRcEprgDDoYh/LvQhIKJa3ayVyzNlGngovPo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786371449; c=relaxed/simple; bh=dHUi1owLpc6KqT4MGa/AODBXO5Q71UlmVql5p4/S4JQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ddwb8ngvWD1ZMS9TBYHxWPIHcdonGeOJX3PAcBBKYZijNSUpHgC/EzvMlzJRab0LyZhj5+vS2t/ye/5GHYomRfJKXEVY+KnPAGwhmguM2XUpKk0KfI/tdQab1TRjLHK+Ro7GzgSYtZfDha9dNdVfi6teD8xByE/+Mka6DN/BIfc= 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=NwQSI6NQ; 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="NwQSI6NQ" Received: from pps.filterd (m0353729.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 67AD1T924026818 for ; Mon, 10 Aug 2026 14:17:28 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=RpbaI5Fgr7rL4NAk8 c2ilstaG1aV057fKTE717SKiBE=; b=NwQSI6NQYuTBXMpaVx4BhmBYNszwlzJaq N8am2sbw9TUqABJQczfGRtxKQZ1fI5YUmtvmcZbtdNjz8lAEYQwb0MeXUNow/h2F UFV+x8QUph+DnAALfIx1Uuvieg7/3wEoCh8r11YHWzOyNKxqqvPlXcXIZ29qB74x 7lJdYQcT30WDBpK4um2+hdted+ppCDSNJ9YKqJs/uGACSFL6bzuOUCqn49+rQquT +L2toNU1UGOFZUTJiuY5crs3oDGu14ZqVsZiEoy0M2yv1xtFOKHUU4TnHGMfSKhb Px0Mdrqo1SXemNW0Ik5Nxn15It2ut3pIYGIUsoUcB9XbcLqfefLQQ== Received: from ppma22.wdc07v.mail.ibm.com (5c.69.3da9.ip4.static.sl-reverse.com [169.61.105.92]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4fwvjyrc7e-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 10 Aug 2026 14:17:27 +0000 (GMT) Received: from pps.filterd (ppma22.wdc07v.mail.ibm.com [127.0.0.1]) by ppma22.wdc07v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 67AEBG0M005048 for ; Mon, 10 Aug 2026 14:17:26 GMT Received: from smtprelay05.fra02v.mail.ibm.com ([9.218.2.225]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4fxf5vw775-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 10 Aug 2026 14:17:26 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (smtpav05.fra02v.mail.ibm.com [10.20.54.104]) by smtprelay05.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 67AEHMFp50790888 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 10 Aug 2026 14:17:22 GMT Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 65E4620040; Mon, 10 Aug 2026 14:17:22 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 2ED322004B; Mon, 10 Aug 2026 14:17:22 +0000 (GMT) Received: from ibm.com (unknown [9.111.40.237]) by smtpav05.fra02v.mail.ibm.com (Postfix) with ESMTP; Mon, 10 Aug 2026 14:17:22 +0000 (GMT) From: Holger Dengler To: stable@vger.kernel.org Cc: Harald Freudenberger , Holger Dengler , Vasily Gorbik Subject: [PATCH 6.6.y] s390/zcrypt: Fix missing mem scrub at clear key import in cca_clr2cipherkey() Date: Mon, 10 Aug 2026 16:17:13 +0200 Message-ID: <20260810141713.564497-1-dengler@linux.ibm.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <2026080533-smashing-unease-48ae@gregkh> References: <2026080533-smashing-unease-48ae@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODEwMDEyMSBTYWx0ZWRfX47x8RLMlPqxp oUwK/YfrwvVObhHymjEzt2W30GFmQuUBr3bPVnblzn7ufAAZKscCbxkmioJd/FM9yCbqgbhg/jK 1wUdx5E2+eIkpSSJRddJdwusT8gWP8lfWQj8SWtW4CpkOPc4LVhYsc32U+fM4v6TASU+n1J9CrA be/ynVg/cTA4Fnbe61J6r/8H5luegpYjFYgDUfwgDpygnTwlyS59AWxaXOlpNPVreG9QM+Kjcqj tncTl6WS48ZcSpEaaFFHl2JC0bBRuUNv0qHmMtOkF+svLXR7QOcYSH1z+h+SJdHT1LzSpxUCkNW yyWoaToET+F6Vhbcs3KAaR5JWxAEkuSiHlkLT/dAw3PIXwI53ZVLVF+XX+oji+r+KGq7r9CNBwt gFq3slsoTWiYXRGkorbfXmeTvt4wE7NZJUMwM7ShtdpsYk7TRFwLwn4uuNQadgpGKhcANPn/13q R7GeuaH9W7oOh0I3gog== X-Proofpoint-Spam-Info: AW1haW4tMjYwODEwMDEyMSBTYWx0ZWRfX4MhCpSJdpYw4 4q+4f5AlGuMlOh8tRv+g1XJ0qTIG5fCuq19XONsBhMBpOZwiiq0psbpDwyD/Ez2EUEgRPtFX0QC AMAP8VL3FqDLGwz6gJqtWXbmQ7nuDLw= X-Authority-Analysis: v=2.4 cv=RqD16imK c=1 sm=1 tr=0 ts=6a79dd77 cx=c_pps a=5BHTudwdYE3Te8bg5FgnPg==:117 a=5BHTudwdYE3Te8bg5FgnPg==:17 a=Sv0fKeRqtYgA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=uAbxVGIbfxUO_5tXvNgY:22 a=VnNF1IyMAAAA:8 a=VwQbUJbxAAAA:8 a=l_XADsiG0JAIV5gd_FcA:9 X-Proofpoint-GUID: IcWHkZ5mF5ZjkRGQXXTu4qKzC7fL3gVA X-Proofpoint-ORIG-GUID: IcWHkZ5mF5ZjkRGQXXTu4qKzC7fL3gVA 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-10_03,2026-08-07_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 priorityscore=1501 suspectscore=0 lowpriorityscore=0 clxscore=1015 adultscore=0 bulkscore=0 malwarescore=0 impostorscore=0 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608100121 From: Harald Freudenberger The helper function _ip_cprb_helper() uses internal buffer memory for building and processing CPRBs. After use this buffer was never scrubbed which could lead to leaving for example clear key material in memory which could be exposed via tricky reuse of this same memory. Extend the _ip_cprb_helper() function with another parameter 'scrub' used to steer scrubbing of this buffer. So now the caller has the opportunity to decide if scrubbing is needed or not. Extend the clear key to secure key token import process in function cca_clr2cipherkey() to tell the helper function from above to scrub the cprb buffer when the clear key value is part of the request data. Add explicit scrubbing on return from function cca_clr2cipherkey() for the random EXOR buffer and the cprb buffer. Overall this cleans the internal used buffer in case of clear key import to prevent sensitive data to get exposed. Fixes: 4bc123b18ce6 ("s390/zcrypt: Add low level functions for CCA AES cipher keys") Cc: stable@vger.kernel.org Reviewed-by: Holger Dengler Signed-off-by: Harald Freudenberger Signed-off-by: Vasily Gorbik (cherry picked from commit 01476391aecef36a3b789ee844357b22fbc90665) Signed-off-by: Holger Dengler --- drivers/s390/crypto/zcrypt_ccamisc.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/drivers/s390/crypto/zcrypt_ccamisc.c b/drivers/s390/crypto/zcrypt_ccamisc.c index c3e3f3a3d8f96..b8526219ecebe 100644 --- a/drivers/s390/crypto/zcrypt_ccamisc.c +++ b/drivers/s390/crypto/zcrypt_ccamisc.c @@ -946,7 +946,8 @@ static int _ip_cprb_helper(u16 cardnr, u16 domain, const u8 *clr_key_value, int clr_key_bit_size, u8 *key_token, - int *key_token_size) + int *key_token_size, + bool scrub) { int rc, n; u8 *mem, *ptr; @@ -1087,7 +1088,7 @@ static int _ip_cprb_helper(u16 cardnr, u16 domain, *key_token_size = t->len; out: - free_cprbmem(mem, PARMBSIZE, 0); + free_cprbmem(mem, PARMBSIZE, scrub); return rc; } @@ -1130,7 +1131,8 @@ int cca_clr2cipherkey(u16 card, u16 dom, u32 keybitsize, u32 keygenflags, * 4/4 COMPLETE the secure cipher key import */ rc = _ip_cprb_helper(card, dom, "AES ", "FIRST ", "MIN3PART", - exorbuf, keybitsize, token, &tokensize); + exorbuf, keybitsize, token, &tokensize, + true); if (rc) { DEBUG_ERR( "%s clear key import 1/4 with CSNBKPI2 failed, rc=%d\n", @@ -1138,7 +1140,8 @@ int cca_clr2cipherkey(u16 card, u16 dom, u32 keybitsize, u32 keygenflags, goto out; } rc = _ip_cprb_helper(card, dom, "AES ", "ADD-PART", NULL, - clrkey, keybitsize, token, &tokensize); + clrkey, keybitsize, token, &tokensize, + true); if (rc) { DEBUG_ERR( "%s clear key import 2/4 with CSNBKPI2 failed, rc=%d\n", @@ -1146,7 +1149,8 @@ int cca_clr2cipherkey(u16 card, u16 dom, u32 keybitsize, u32 keygenflags, goto out; } rc = _ip_cprb_helper(card, dom, "AES ", "ADD-PART", NULL, - exorbuf, keybitsize, token, &tokensize); + exorbuf, keybitsize, token, &tokensize, + true); if (rc) { DEBUG_ERR( "%s clear key import 3/4 with CSNBKPI2 failed, rc=%d\n", @@ -1154,7 +1158,8 @@ int cca_clr2cipherkey(u16 card, u16 dom, u32 keybitsize, u32 keygenflags, goto out; } rc = _ip_cprb_helper(card, dom, "AES ", "COMPLETE", NULL, - NULL, keybitsize, token, &tokensize); + NULL, keybitsize, token, &tokensize, + true); if (rc) { DEBUG_ERR( "%s clear key import 4/4 with CSNBKPI2 failed, rc=%d\n", @@ -1172,7 +1177,8 @@ int cca_clr2cipherkey(u16 card, u16 dom, u32 keybitsize, u32 keygenflags, *keybufsize = tokensize; out: - kfree(token); + memzero_explicit(exorbuf, sizeof(exorbuf)); + kfree_sensitive(token); return rc; } EXPORT_SYMBOL(cca_clr2cipherkey); -- 2.55.0