From patchwork Fri Oct 23 07:37:00 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 55528 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n9N7bNcL025010 for ; Fri, 23 Oct 2009 07:37:23 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751597AbZJWHhL (ORCPT ); Fri, 23 Oct 2009 03:37:11 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751606AbZJWHhL (ORCPT ); Fri, 23 Oct 2009 03:37:11 -0400 Received: from goliath.siemens.de ([192.35.17.28]:15700 "EHLO goliath.siemens.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751597AbZJWHhK (ORCPT ); Fri, 23 Oct 2009 03:37:10 -0400 Received: from mail1.siemens.de (localhost [127.0.0.1]) by goliath.siemens.de (8.12.11.20060308/8.12.11) with ESMTP id n9N7b09G000694; Fri, 23 Oct 2009 09:37:01 +0200 Received: from [139.25.173.76] ([139.25.173.76]) by mail1.siemens.de (8.12.11.20060308/8.12.11) with ESMTP id n9N7b0t4007163; Fri, 23 Oct 2009 09:37:00 +0200 Message-ID: <4AE15D1C.30905@siemens.com> Date: Fri, 23 Oct 2009 09:37:00 +0200 From: Jan Kiszka User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 To: Avi Kivity , Marcelo Tosatti CC: kvm-devel Subject: [PATCH] KVM: x86: Catch potential overrun in MCE setup Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index c1e9094..e2fb5e0 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -1720,7 +1720,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) + if (!bank_num || bank_num >= KVM_MAX_MCE_BANKS) goto out; if (mcg_cap & ~(KVM_MCE_CAP_SUPPORTED | 0xff | 0xff0000)) goto out;