From: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
To: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
Cc: Avi Kivity <avi@redhat.com>,
Marcelo Tosatti <mtosatti@redhat.com>,
LKML <linux-kernel@vger.kernel.org>, KVM <kvm@vger.kernel.org>
Subject: [PATCH v6 02/12] KVM: fix missing check for memslot flags
Date: Tue, 21 Aug 2012 10:58:13 +0800 [thread overview]
Message-ID: <5032F945.9030707@linux.vnet.ibm.com> (raw)
In-Reply-To: <5032F8FD.2020306@linux.vnet.ibm.com>
Check flags when memslot is registered from userspace as Avi's suggestion
Signed-off-by: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
---
virt/kvm/kvm_main.c | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index a2e85af..7b94d70 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -678,6 +678,14 @@ void update_memslots(struct kvm_memslots *slots, struct kvm_memory_slot *new)
slots->generation++;
}
+static int check_memory_region_flags(struct kvm_userspace_memory_region *mem)
+{
+ if (mem->flags & ~KVM_MEM_LOG_DIRTY_PAGES)
+ return -EINVAL;
+
+ return 0;
+}
+
/*
* Allocate some memory and give it an address in the guest physical address
* space.
@@ -698,6 +706,10 @@ int __kvm_set_memory_region(struct kvm *kvm,
struct kvm_memory_slot old, new;
struct kvm_memslots *slots, *old_memslots;
+ r = check_memory_region_flags(mem);
+ if (r)
+ goto out;
+
r = -EINVAL;
/* General sanity checks */
if (mem->memory_size & (PAGE_SIZE - 1))
--
1.7.7.6
next prev parent reply other threads:[~2012-08-21 2:58 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-21 2:57 [PATCH v6 00/12] KVM: introduce readonly memslot Xiao Guangrong
2012-08-21 2:57 ` [PATCH v6 01/12] KVM: x86: fix possible infinite loop caused by reexecute_instruction Xiao Guangrong
2012-08-22 12:01 ` Avi Kivity
2012-08-22 12:49 ` Xiao Guangrong
2012-08-21 2:58 ` Xiao Guangrong [this message]
2012-08-21 2:58 ` [PATCH v6 03/12] KVM: hide KVM_MEMSLOT_INVALID from userspace Xiao Guangrong
2012-08-21 2:59 ` [PATCH v6 04/12] KVM: introduce gfn_to_pfn_memslot_atomic Xiao Guangrong
2012-08-21 2:59 ` [PATCH v6 05/12] KVM: introduce gfn_to_hva_read/kvm_read_hva/kvm_read_hva_atomic Xiao Guangrong
2012-08-21 3:00 ` [PATCH v6 06/12] KVM: reorganize hva_to_pfn Xiao Guangrong
2012-08-21 3:00 ` [PATCH v6 07/12] KVM: use 'writable' as a hint to map writable pfn Xiao Guangrong
2012-08-21 3:01 ` [PATCH v6 08/12] KVM: introduce KVM_PFN_ERR_RO_FAULT Xiao Guangrong
2012-08-21 3:01 ` [PATCH v6 09/12] KVM: introduce KVM_HVA_ERR_BAD Xiao Guangrong
2012-08-21 3:02 ` [PATCH v6 10/12] KVM: introduce KVM_HVA_ERR_RO_BAD Xiao Guangrong
2012-08-21 3:02 ` [PATCH v6 11/12] KVM: introduce readonly memslot Xiao Guangrong
2012-09-07 10:23 ` Jan Kiszka
2012-09-07 10:47 ` Xiao Guangrong
2012-09-07 11:14 ` Jan Kiszka
2012-09-09 13:42 ` Avi Kivity
2012-09-09 13:52 ` Jan Kiszka
2012-08-21 3:03 ` [PATCH v6 12/12] KVM: indicate readonly access fault Xiao Guangrong
2012-08-22 12:06 ` Avi Kivity
2012-08-22 12:47 ` Xiao Guangrong
2012-09-06 14:09 ` Avi Kivity
2012-09-07 9:56 ` Xiao Guangrong
2012-09-09 13:46 ` Avi Kivity
2012-09-10 22:31 ` Marcelo Tosatti
2012-09-11 9:18 ` Avi Kivity
2012-09-11 14:39 ` Marcelo Tosatti
2012-09-12 15:27 ` Marcelo Tosatti
2012-09-12 15:34 ` Avi Kivity
2012-09-12 15:44 ` Marcelo Tosatti
2012-09-12 15:55 ` Avi Kivity
2012-08-22 12:09 ` [PATCH v6 00/12] KVM: introduce readonly memslot Avi Kivity
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5032F945.9030707@linux.vnet.ibm.com \
--to=xiaoguangrong@linux.vnet.ibm.com \
--cc=avi@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mtosatti@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).