From 2dcce5393d3a652686b2047a46adb6ce02a42ea8 Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Mon, 4 Jan 2010 19:26:14 +1030
Subject: [PATCH] --- yaml --- r: 178750 b: refs/heads/master c:
 3e27249c84beed1c79d767b350e52ad038db9053 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/lguest/segments.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b7632b8e9a43..062a2c1dec51 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 741f21e811752b440c505bf0149c4d16e9f3160d
+refs/heads/master: 3e27249c84beed1c79d767b350e52ad038db9053
diff --git a/trunk/drivers/lguest/segments.c b/trunk/drivers/lguest/segments.c
index 951c57b0a7e0..ede46581351a 100644
--- a/trunk/drivers/lguest/segments.c
+++ b/trunk/drivers/lguest/segments.c
@@ -179,8 +179,10 @@ void load_guest_gdt_entry(struct lg_cpu *cpu, u32 num, u32 lo, u32 hi)
 	 * We assume the Guest has the same number of GDT entries as the
 	 * Host, otherwise we'd have to dynamically allocate the Guest GDT.
 	 */
-	if (num >= ARRAY_SIZE(cpu->arch.gdt))
+	if (num >= ARRAY_SIZE(cpu->arch.gdt)) {
 		kill_guest(cpu, "too many gdt entries %i", num);
+		return;
+	}
 
 	/* Set it up, then fix it. */
 	cpu->arch.gdt[num].a = lo;