From a4828a6b13e3af4d5dbd37fa48662d12ba633846 Mon Sep 17 00:00:00 2001
From: Alex Williamson <alex.williamson@redhat.com>
Date: Fri, 29 Jun 2012 09:56:24 -0600
Subject: [PATCH] --- yaml --- r: 311671 b: refs/heads/master c:
 326cf0334bacfdf43039cf75997a022b9e51535d h: refs/heads/master i:   311669:
 becef0ff4aaacabe4877a22360d78863adc6b08b   311667:
 488aaee3ef2115ab48b5d3e8b8ab3b2296a1a826   311663:
 1d6c950c3247df8e4e644cbf9718136607d0d04d v: v3

---
 [refs]                   | 2 +-
 trunk/virt/kvm/eventfd.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 65a1d2e4a9b1..a84e737f38cf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f36992e31284131a978d07bb14e582ce67b46b64
+refs/heads/master: 326cf0334bacfdf43039cf75997a022b9e51535d
diff --git a/trunk/virt/kvm/eventfd.c b/trunk/virt/kvm/eventfd.c
index c307c24c147a..7d7e2aaffece 100644
--- a/trunk/virt/kvm/eventfd.c
+++ b/trunk/virt/kvm/eventfd.c
@@ -340,6 +340,9 @@ kvm_irqfd_deassign(struct kvm *kvm, struct kvm_irqfd *args)
 int
 kvm_irqfd(struct kvm *kvm, struct kvm_irqfd *args)
 {
+	if (args->flags & ~KVM_IRQFD_FLAG_DEASSIGN)
+		return -EINVAL;
+
 	if (args->flags & KVM_IRQFD_FLAG_DEASSIGN)
 		return kvm_irqfd_deassign(kvm, args);