* [PATCH] KVM: x86: Fix off-by-one error in kvm_vcpu_ioctl_x86_setup_mce
@ 2020-05-11 22:56 Jim Mattson
2020-05-14 17:46 ` Jim Mattson
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Jim Mattson @ 2020-05-11 22:56 UTC (permalink / raw)
To: kvm, Paolo Bonzini; +Cc: Jim Mattson, Jue Wang, Peter Shier
Bank_num is a one-based count of banks, not a zero-based index. It
overflows the allocated space only when strictly greater than
KVM_MAX_MCE_BANKS.
Fixes: a9e38c3e01ad ("KVM: x86: Catch potential overrun in MCE setup")
Signed-off-by: Jue Wang <juew@google.com>
Signed-off-by: Jim Mattson <jmattson@google.com>
Reviewed-by: Peter Shier <pshier@google.com>
---
arch/x86/kvm/x86.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index d786c7d27ce5..5bf45c9aa8e5 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -3751,7 +3751,7 @@ static int kvm_vcpu_ioctl_x86_setup_mce(struct kvm_vcpu *vcpu,
unsigned bank_num = mcg_cap & 0xff, bank;
r = -EINVAL;
- if (!bank_num || bank_num >= KVM_MAX_MCE_BANKS)
+ if (!bank_num || bank_num > KVM_MAX_MCE_BANKS)
goto out;
if (mcg_cap & ~(kvm_mce_cap_supported | 0xff | 0xff0000))
goto out;
--
2.26.2.645.ge9eca65c58-goog
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] KVM: x86: Fix off-by-one error in kvm_vcpu_ioctl_x86_setup_mce
2020-05-11 22:56 [PATCH] KVM: x86: Fix off-by-one error in kvm_vcpu_ioctl_x86_setup_mce Jim Mattson
@ 2020-05-14 17:46 ` Jim Mattson
2020-05-15 12:36 ` Vitaly Kuznetsov
2020-05-15 17:49 ` Paolo Bonzini
2 siblings, 0 replies; 4+ messages in thread
From: Jim Mattson @ 2020-05-14 17:46 UTC (permalink / raw)
To: kvm list, Paolo Bonzini; +Cc: Jue Wang, Peter Shier
On Mon, May 11, 2020 at 3:56 PM Jim Mattson <jmattson@google.com> wrote:
>
> Bank_num is a one-based count of banks, not a zero-based index. It
> overflows the allocated space only when strictly greater than
> KVM_MAX_MCE_BANKS.
>
> Fixes: a9e38c3e01ad ("KVM: x86: Catch potential overrun in MCE setup")
> Signed-off-by: Jue Wang <juew@google.com>
> Signed-off-by: Jim Mattson <jmattson@google.com>
> Reviewed-by: Peter Shier <pshier@google.com>
> ---
> arch/x86/kvm/x86.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
> index d786c7d27ce5..5bf45c9aa8e5 100644
> --- a/arch/x86/kvm/x86.c
> +++ b/arch/x86/kvm/x86.c
> @@ -3751,7 +3751,7 @@ static int kvm_vcpu_ioctl_x86_setup_mce(struct kvm_vcpu *vcpu,
> unsigned bank_num = mcg_cap & 0xff, bank;
>
> r = -EINVAL;
> - if (!bank_num || bank_num >= KVM_MAX_MCE_BANKS)
> + if (!bank_num || bank_num > KVM_MAX_MCE_BANKS)
> goto out;
> if (mcg_cap & ~(kvm_mce_cap_supported | 0xff | 0xff0000))
> goto out;
> --
> 2.26.2.645.ge9eca65c58-goog
>
Ping?
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] KVM: x86: Fix off-by-one error in kvm_vcpu_ioctl_x86_setup_mce
2020-05-11 22:56 [PATCH] KVM: x86: Fix off-by-one error in kvm_vcpu_ioctl_x86_setup_mce Jim Mattson
2020-05-14 17:46 ` Jim Mattson
@ 2020-05-15 12:36 ` Vitaly Kuznetsov
2020-05-15 17:49 ` Paolo Bonzini
2 siblings, 0 replies; 4+ messages in thread
From: Vitaly Kuznetsov @ 2020-05-15 12:36 UTC (permalink / raw)
To: Jim Mattson, kvm; +Cc: Jue Wang, Peter Shier, Paolo Bonzini
Jim Mattson <jmattson@google.com> writes:
> Bank_num is a one-based count of banks, not a zero-based index. It
> overflows the allocated space only when strictly greater than
> KVM_MAX_MCE_BANKS.
>
> Fixes: a9e38c3e01ad ("KVM: x86: Catch potential overrun in MCE setup")
> Signed-off-by: Jue Wang <juew@google.com>
> Signed-off-by: Jim Mattson <jmattson@google.com>
> Reviewed-by: Peter Shier <pshier@google.com>
> ---
> arch/x86/kvm/x86.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
> index d786c7d27ce5..5bf45c9aa8e5 100644
> --- a/arch/x86/kvm/x86.c
> +++ b/arch/x86/kvm/x86.c
> @@ -3751,7 +3751,7 @@ static int kvm_vcpu_ioctl_x86_setup_mce(struct kvm_vcpu *vcpu,
> unsigned bank_num = mcg_cap & 0xff, bank;
/* it would be great to get rid of bare unsigned-s in
kvm_vcpu_ioctl_x86_setup_mce/kvm_vcpu_ioctl_x86_set_mce ... */
>
> r = -EINVAL;
> - if (!bank_num || bank_num >= KVM_MAX_MCE_BANKS)
> + if (!bank_num || bank_num > KVM_MAX_MCE_BANKS)
> goto out;
> if (mcg_cap & ~(kvm_mce_cap_supported | 0xff | 0xff0000))
> goto out;
Reviewed-by: Vitaly Kuznetsov <vkuznets@redhat.com>
--
Vitaly
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] KVM: x86: Fix off-by-one error in kvm_vcpu_ioctl_x86_setup_mce
2020-05-11 22:56 [PATCH] KVM: x86: Fix off-by-one error in kvm_vcpu_ioctl_x86_setup_mce Jim Mattson
2020-05-14 17:46 ` Jim Mattson
2020-05-15 12:36 ` Vitaly Kuznetsov
@ 2020-05-15 17:49 ` Paolo Bonzini
2 siblings, 0 replies; 4+ messages in thread
From: Paolo Bonzini @ 2020-05-15 17:49 UTC (permalink / raw)
To: Jim Mattson, kvm; +Cc: Jue Wang, Peter Shier
On 12/05/20 00:56, Jim Mattson wrote:
> Bank_num is a one-based count of banks, not a zero-based index. It
> overflows the allocated space only when strictly greater than
> KVM_MAX_MCE_BANKS.
>
> Fixes: a9e38c3e01ad ("KVM: x86: Catch potential overrun in MCE setup")
> Signed-off-by: Jue Wang <juew@google.com>
> Signed-off-by: Jim Mattson <jmattson@google.com>
> Reviewed-by: Peter Shier <pshier@google.com>
> ---
> arch/x86/kvm/x86.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
> index d786c7d27ce5..5bf45c9aa8e5 100644
> --- a/arch/x86/kvm/x86.c
> +++ b/arch/x86/kvm/x86.c
> @@ -3751,7 +3751,7 @@ static int kvm_vcpu_ioctl_x86_setup_mce(struct kvm_vcpu *vcpu,
> unsigned bank_num = mcg_cap & 0xff, bank;
>
> r = -EINVAL;
> - if (!bank_num || bank_num >= KVM_MAX_MCE_BANKS)
> + if (!bank_num || bank_num > KVM_MAX_MCE_BANKS)
> goto out;
> if (mcg_cap & ~(kvm_mce_cap_supported | 0xff | 0xff0000))
> goto out;
>
Queued, thanks.
Paolo
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-05-15 17:49 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-11 22:56 [PATCH] KVM: x86: Fix off-by-one error in kvm_vcpu_ioctl_x86_setup_mce Jim Mattson
2020-05-14 17:46 ` Jim Mattson
2020-05-15 12:36 ` Vitaly Kuznetsov
2020-05-15 17:49 ` Paolo Bonzini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).