KVM: arm64: Fix buffer overflow in kvm_arm_set_fw_reg()
authorDan Carpenter <dan.carpenter@linaro.org>
Wed, 19 Apr 2023 10:16:13 +0000 (13:16 +0300)
committerOliver Upton <oliver.upton@linux.dev>
Wed, 19 Apr 2023 15:22:37 +0000 (15:22 +0000)
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 <dan.carpenter@linaro.org>
Reviewed-by: Steven Price <steven.price@arm.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Reviewed-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/4efbab8c-640f-43b2-8ac6-6d68e08280fe@kili.mountain
Signed-off-by: Oliver Upton <oliver.upton@linux.dev>
arch/arm64/kvm/hypercalls.c

index 5da884e11337a6d420e3dc71456b469057300d1c..c4b4678bc4a4580c6d9fd924cb66656d3c87cd98 100644 (file)
@@ -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;