From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 6D470BA46 for ; Tue, 7 Mar 2023 18:10:35 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E73DCC4339B; Tue, 7 Mar 2023 18:10:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678212635; bh=guo0JD4nztg1lIPn7QFGXXnuDWf2Ws87y9oFWgkHy2M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1EVqpDpuzQk8mBxuO3zeKri4/PcmwwSfM6MWBAG1IOcLZWEvwaEuiUm1YgkiaVU6d a03ec0ySSFdYrm2kVHFNVjAwDfGbVXAwEPbSb0c7B9jM8S0vPx7JKUvyxcqiV+BI+A ZeOxR/tMIeftJLNK6i7xdz5ZQoAOFDn02tco7Yck= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Halil Pasic , Janosch Frank , Tony Krowiak , Pierre Morel , Heiko Carstens , Sasha Levin Subject: [PATCH 6.1 217/885] s390: vfio-ap: tighten the NIB validity check Date: Tue, 7 Mar 2023 17:52:31 +0100 Message-Id: <20230307170011.511873149@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230307170001.594919529@linuxfoundation.org> References: <20230307170001.594919529@linuxfoundation.org> User-Agent: quilt/0.67 Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Halil Pasic [ Upstream commit a64a6d23874c574d30a9816124b2dc37467f3811 ] The NIB is architecturally invalid if the address designates a storage location that is not installed or if it is zero. Signed-off-by: Halil Pasic Reported-by: Janosch Frank Fixes: ec89b55e3bce ("s390: ap: implement PAPQ AQIC interception in kernel") Reviewed-by: Tony Krowiak Reviewed-by: Pierre Morel Signed-off-by: Heiko Carstens Signed-off-by: Sasha Levin --- drivers/s390/crypto/vfio_ap_ops.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/s390/crypto/vfio_ap_ops.c b/drivers/s390/crypto/vfio_ap_ops.c index a109c59f18f78..934515959ebf4 100644 --- a/drivers/s390/crypto/vfio_ap_ops.c +++ b/drivers/s390/crypto/vfio_ap_ops.c @@ -349,6 +349,8 @@ static int vfio_ap_validate_nib(struct kvm_vcpu *vcpu, dma_addr_t *nib) { *nib = vcpu->run->s.regs.gprs[2]; + if (!*nib) + return -EINVAL; if (kvm_is_error_hva(gfn_to_hva(vcpu->kvm, *nib >> PAGE_SHIFT))) return -EINVAL; -- 2.39.2