Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

[sfrench/cifs-2.6.git] / drivers / lguest / segments.c

diff --git a/drivers/lguest/segments.c b/drivers/lguest/segments.c
index 951c57b0a7e075a9d927193d3c54d46ccb682545..ede46581351a04d9a635aee91bec38d69c67c76f 100644 (file)
--- a/drivers/lguest/segments.c
+++ b/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;