summaryrefslogtreecommitdiffstats
path: root/arch/x86/kvm
diff options
context:
space:
mode:
authorSasha Levin <levinsasha928@gmail.com>2011-12-04 19:36:28 +0200
committerAvi Kivity <avi@redhat.com>2011-12-27 11:22:20 +0200
commitcdfca7b346e6dbab1ba33260c28ccb8333485a5b (patch)
tree423d4487ee5604a69943e8daade01fbec1879ef6 /arch/x86/kvm
parent3f745f1e224e05e845a15760a55f3fd323f7a753 (diff)
downloadblackbird-op-linux-cdfca7b346e6dbab1ba33260c28ccb8333485a5b.tar.gz
blackbird-op-linux-cdfca7b346e6dbab1ba33260c28ccb8333485a5b.zip
KVM: Use kmemdup() instead of kmalloc/memcpy
Switch to kmemdup() in two places to shorten the code and avoid possible bugs. Signed-off-by: Sasha Levin <levinsasha928@gmail.com> Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/x86/kvm')
-rw-r--r--arch/x86/kvm/x86.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index d55a94f1155a..03042d60a8fc 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -3031,10 +3031,10 @@ int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm,
memset(dirty_bitmap_head, 0, n);
r = -ENOMEM;
- slots = kzalloc(sizeof(struct kvm_memslots), GFP_KERNEL);
+ slots = kmemdup(kvm->memslots, sizeof(*kvm->memslots), GFP_KERNEL);
if (!slots)
goto out;
- memcpy(slots, kvm->memslots, sizeof(struct kvm_memslots));
+
memslot = id_to_memslot(slots, log->slot);
memslot->nr_dirty_pages = 0;
memslot->dirty_bitmap = dirty_bitmap_head;
OpenPOWER on IntegriCloud