From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1C043C77B7C for ; Sun, 23 Apr 2023 10:26:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229453AbjDWK0S (ORCPT ); Sun, 23 Apr 2023 06:26:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44320 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229611AbjDWK0S (ORCPT ); Sun, 23 Apr 2023 06:26:18 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 24D381BD5 for ; Sun, 23 Apr 2023 03:26:17 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 8FC7360BD3 for ; Sun, 23 Apr 2023 10:26:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 84547C433EF; Sun, 23 Apr 2023 10:26:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1682245562; bh=uks+01Q6K4fylhh6juyA/FzQSO7e8xKrfgC8OLmerNQ=; h=Subject:To:Cc:From:Date:From; b=ycEeosmgdkPNcRfFG2YS85hy1Mej3RMNMqi8+CfRM7NYjdRbea3+8aV4NkFcxRrZC QVHUUWyAAZoTHi7uC0h3sPj454itm2euSH8Egh69k/JlSVcn9zgJWmdmsukY9CgZHS qWa4UjpLkeWwAJwFDPa9fYucPSsbrIchBU1j4F+E= Subject: FAILED: patch "[PATCH] KVM: arm64: Fix buffer overflow in kvm_arm_set_fw_reg()" failed to apply to 5.10-stable tree To: dan.carpenter@linaro.org, eric.auger@redhat.com, maz@kernel.org, oliver.upton@linux.dev, steven.price@arm.com Cc: From: Date: Sun, 23 Apr 2023 12:25:50 +0200 Message-ID: <2023042350-coveted-collapse-44f5@gregkh> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch below does not apply to the 5.10-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y git checkout FETCH_HEAD git cherry-pick -x a25bc8486f9c01c1af6b6c5657234b2eee2c39d6 # git commit -s git send-email --to '' --in-reply-to '2023042350-coveted-collapse-44f5@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^.. Possible dependencies: a25bc8486f9c ("KVM: arm64: Fix buffer overflow in kvm_arm_set_fw_reg()") 85fbe08e4da8 ("KVM: arm64: Factor out firmware register handling from psci.c") 1ebdbeb03efe ("Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From a25bc8486f9c01c1af6b6c5657234b2eee2c39d6 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Wed, 19 Apr 2023 13:16:13 +0300 Subject: [PATCH] KVM: arm64: Fix buffer overflow in kvm_arm_set_fw_reg() 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 diff --git a/arch/arm64/kvm/hypercalls.c b/arch/arm64/kvm/hypercalls.c index 5da884e11337..c4b4678bc4a4 100644 --- a/arch/arm64/kvm/hypercalls.c +++ b/arch/arm64/kvm/hypercalls.c @@ -397,6 +397,8 @@ int kvm_arm_set_fw_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg) 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;