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 51E34290A for ; Fri, 28 Apr 2023 11:30:01 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CD4CFC433EF; Fri, 28 Apr 2023 11:30:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1682681401; bh=aaOGD4lC/ZWuwEA1UtJFvUBnGv7OR6jHFa8LwnIj1Xo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gSbIOBA4W48Lb2hzehVj3E3CBffn0HJG/F74HQAlb71Ukm4OM6D3Ug27+BU+J35zz gMFr1Xt/YQK1TpKkOsBcroZEh9Hgq21nTXU0SDwZQ01aNf2+Se/R4xuPIVmJdHaY9V FjLSi27973BfUrhOp3yEVkjJUd7HRcgowGRvyAnQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Dan Carpenter , Steven Price , Eric Auger , Marc Zyngier , Oliver Upton , Will Deacon Subject: [PATCH 5.15 04/13] KVM: arm64: Fix buffer overflow in kvm_arm_set_fw_reg() Date: Fri, 28 Apr 2023 13:28:08 +0200 Message-Id: <20230428112039.297451207@linuxfoundation.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230428112039.133978540@linuxfoundation.org> References: <20230428112039.133978540@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: Dan Carpenter commit a25bc8486f9c01c1af6b6c5657234b2eee2c39d6 upstream. The KVM_REG_SIZE() comes from the ioctl and it can be a power of two between 0-32768 but if it is more than sizeof(long) this will corrupt memory. Fixes: 99adb567632b ("KVM: arm/arm64: Add save/restore support for firmware workaround state") Signed-off-by: Dan Carpenter Reviewed-by: Steven Price Reviewed-by: Eric Auger Reviewed-by: Marc Zyngier Link: https://lore.kernel.org/r/4efbab8c-640f-43b2-8ac6-6d68e08280fe@kili.mountain Signed-off-by: Oliver Upton [will: kvm_arm_set_fw_reg() lives in psci.c not hypercalls.c] Signed-off-by: Will Deacon Signed-off-by: Greg Kroah-Hartman --- arch/arm64/kvm/psci.c | 2 ++ 1 file changed, 2 insertions(+) --- a/arch/arm64/kvm/psci.c +++ b/arch/arm64/kvm/psci.c @@ -508,6 +508,8 @@ int kvm_arm_set_fw_reg(struct kvm_vcpu * u64 val; int wa_level; + if (KVM_REG_SIZE(reg->id) != sizeof(val)) + return -ENOENT; if (copy_from_user(&val, uaddr, KVM_REG_SIZE(reg->id))) return -EFAULT;