From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 B90633876BA; Sat, 17 Oct 2026 16:29:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792254562; cv=none; b=py5CAkB8A4LhzpnioIPBZss3Mu/YOZhQfDjhDMK6sEf5oMnSQPcItiQj8PmJnhfGes40RfVd6e2znkRUkq14GuHleCQYMZDojEgZvyEZ7DyB1R24tAsuTwoeGHw2eupwbOEDN5JgSgkvWim9vW7Y9JXoAgQ9IqWFXjnP2WwEOHk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792254562; c=relaxed/simple; bh=0kDzZsC1/NHmiMXsW149WnX9mh9x8Ov+ECMsqQXAwM4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YgV6maQlmpjt5U8jyFtF7OyOs8dP1v09y4zsbFm2/pqD1N5UiupxiFSKqN5mjRvvuFp4SMLwBI706EjjJBAMj8Np8YCSk5IJIYy/F0M2suc1XPb0XUvvCsrhV2Z7v6PUuuVor9tWm7kCLCeyMGTSnnxfyuokxej9lhKSWLjxL/s= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=1FFp97rH; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="1FFp97rH" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 15AE41F000C4; Sat, 17 Oct 2026 16:29:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1792254561; bh=O2pcXGMzJOEbmvAU882bg0/KopWpL6a/jGFL5ZsgEZA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=1FFp97rH/dkyybhrKxOZBY3CgVnZuJtbKdATG8Fh1dJijnQDQD7VQ3ytq35Z03c0K rdsbX08a+eFe46q2xDMjcfELFyKBOx2XuK9iXaOQ/wowGatj4aE5mSOUsLv+fkcO9H ko5LXfweixm3UGMistRaK7YnHojy8K2IJ4Egb42k= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Christian Borntraeger , Finn Callies , Harald Freudenberger , Vasily Gorbik , Sasha Levin Subject: [PATCH 6.12 488/869] s390/zcrypt: Close speculative mem read possibility Date: Sat, 17 Oct 2026 17:55:29 +0200 Message-ID: <20261017160049.627498410@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261017160036.979869304@linuxfoundation.org> References: <20261017160036.979869304@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Harald Freudenberger [ Upstream commit e935cd525af4c6ed2e2c6404aa27ca19c7f39ddb ] The domain value is extracted from a given CCA or EP11 ioctl struct when a CPRB is about to be sent. Thus this is a user controlled value. Under some special conditions (custom device node used, administrative load) this value is used as an array index after bounds checking, but without speculation barrier. Add the missing array_index_nospec() call to prevent speculative execution where this domain value is used. Fixes: cfd68b33094e ("s390/zcrypt: Filter admin CPRBs on custom devices") Cc: stable@vger.kernel.org Reported-by: Christian Borntraeger Reviewed-by: Finn Callies Signed-off-by: Harald Freudenberger Signed-off-by: Vasily Gorbik Signed-off-by: Sasha Levin --- drivers/s390/crypto/zcrypt_api.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/s390/crypto/zcrypt_api.c b/drivers/s390/crypto/zcrypt_api.c index df1f9dc6a37ad..0ded84744b1ee 100644 --- a/drivers/s390/crypto/zcrypt_api.c +++ b/drivers/s390/crypto/zcrypt_api.c @@ -874,6 +874,7 @@ static long _zcrypt_send_cprb(u32 xflags, struct ap_perms *perms, if (perms != &ap_perms && domain < AP_DOMAINS) { if (ap_msg.flags & AP_MSG_FLAG_ADMIN) { + domain = array_index_nospec(domain, AP_DOMAINS); if (!test_bit_inv(domain, perms->adm)) { rc = -ENODEV; goto out; @@ -1077,6 +1078,7 @@ static long _zcrypt_send_ep11_cprb(u32 xflags, struct ap_perms *perms, if (perms != &ap_perms && domain < AP_DOMAINS) { if (ap_msg.flags & AP_MSG_FLAG_ADMIN) { + domain = array_index_nospec(domain, AP_DOMAINS); if (!test_bit_inv(domain, perms->adm)) { rc = -ENODEV; goto out_free; -- 2.53.0