[prev in list] [next in list] [prev in thread] [next in thread] 

List:       linux-stable-commits
Subject:    patch kvm-fix-cpuid-e2big-handling-for-extended-request-types.patch added to 2.6.30-stable tree
From:       <gregkh () suse ! de>
Date:       2009-09-30 23:28:46
Message-ID: 20090930232911.856BB48716 () coco ! kroah ! org
[Download RAW message or body]


This is a note to let you know that we have just queued up the patch titled

    Subject: KVM: fix cpuid E2BIG handling for extended request types

to the 2.6.30-stable tree.  Its filename is

    kvm-fix-cpuid-e2big-handling-for-extended-request-types.patch

A git repo of this tree can be found at 
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary


From mtosatti@redhat.com  Wed Sep 30 16:23:18 2009
From: Mark McLoughlin <markmc@redhat.com>
Date: Fri, 18 Sep 2009 20:08:07 -0300
Subject: KVM: fix cpuid E2BIG handling for extended request types
To: stable@kernel.org
Cc: Mark McLoughlin <markmc@redhat.com>, avi@redhat.com
Message-ID: <1253315287-12229-10-git-send-email-mtosatti@redhat.com>


From: Mark McLoughlin <markmc@redhat.com>

(cherry picked from commit cb007648de83cf226d69ec76e1c01848b4e8e49f)

If we run out of cpuid entries for extended request types
we should return -E2BIG, just like we do for the standard
request types.

Signed-off-by: Mark McLoughlin <markmc@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
 arch/x86/kvm/x86.c |    4 ++++
 1 file changed, 4 insertions(+)

--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -1438,6 +1438,10 @@ static int kvm_dev_ioctl_get_supported_c
 	for (func = 0x80000001; func <= limit && nent < cpuid->nent; ++func)
 		do_cpuid_ent(&cpuid_entries[nent], func, 0,
 			     &nent, cpuid->nent);
+	r = -E2BIG;
+	if (nent >= cpuid->nent)
+		goto out_free;
+
 	r = -EFAULT;
 	if (copy_to_user(entries, cpuid_entries,
 			 nent * sizeof(struct kvm_cpuid_entry2)))


Patches currently in stable-queue which might be from markmc@redhat.com are

queue-2.6.30/kvm-fix-cpuid-e2big-handling-for-extended-request-types.patch
--
To unsubscribe from this list: send the line "unsubscribe stable-commits" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
[prev in list] [next in list] [prev in thread] [next in thread]