diff --git a/[refs] b/[refs]
index cb62890b8cc0..c86251a0f431 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9438ce9dbbf512fd717051284f568d5cb35e5cf1
+refs/heads/master: c3b3f16d1bceb5ac5f21528f889810b4ac5a3596
diff --git a/trunk/drivers/xen/events.c b/trunk/drivers/xen/events.c
index a3bcd6175f4a..e5e5812a1014 100644
--- a/trunk/drivers/xen/events.c
+++ b/trunk/drivers/xen/events.c
@@ -1104,6 +1104,9 @@ int evtchn_get(unsigned int evtchn)
 	struct irq_info *info;
 	int err = -ENOENT;
 
+	if (evtchn >= NR_EVENT_CHANNELS)
+		return -EINVAL;
+
 	mutex_lock(&irq_mapping_update_lock);
 
 	irq = evtchn_to_irq[evtchn];