summaryrefslogtreecommitdiffstats
path: root/drivers/kvm
diff options
context:
space:
mode:
authorAvi Kivity <avi@qumranet.com>2007-03-07 13:11:17 +0200
committerAvi Kivity <avi@qumranet.com>2007-05-03 10:52:25 +0300
commitf0fe510864a4520a85dfa35ae14f5f376c56efc7 (patch)
tree3d6422576b072480b78b3b505ec03d98ab21c0c3 /drivers/kvm
parent07c45a366d89f8eaec5d9890e810171b408f9a52 (diff)
downloadop-kernel-dev-f0fe510864a4520a85dfa35ae14f5f376c56efc7.zip
op-kernel-dev-f0fe510864a4520a85dfa35ae14f5f376c56efc7.tar.gz
KVM: Future-proof argument-less ioctls
Some ioctls ignore their arguments. By requiring them to be zero now, we allow a nonzero value to have some special meaning in the future. Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'drivers/kvm')
-rw-r--r--drivers/kvm/kvm_main.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/kvm/kvm_main.c b/drivers/kvm/kvm_main.c
index cba0b87..ba7f43a 100644
--- a/drivers/kvm/kvm_main.c
+++ b/drivers/kvm/kvm_main.c
@@ -2169,6 +2169,9 @@ static long kvm_vcpu_ioctl(struct file *filp,
switch (ioctl) {
case KVM_RUN:
+ r = -EINVAL;
+ if (arg)
+ goto out;
r = kvm_vcpu_ioctl_run(vcpu, vcpu->run);
break;
case KVM_GET_REGS: {
@@ -2440,9 +2443,15 @@ static long kvm_dev_ioctl(struct file *filp,
switch (ioctl) {
case KVM_GET_API_VERSION:
+ r = -EINVAL;
+ if (arg)
+ goto out;
r = KVM_API_VERSION;
break;
case KVM_CREATE_VM:
+ r = -EINVAL;
+ if (arg)
+ goto out;
r = kvm_dev_ioctl_create_vm();
break;
case KVM_GET_MSR_INDEX_LIST: {
OpenPOWER on IntegriCloud