[Qemu-devel] [PATCH 3/5] kqemu: Fix forbidden selector range change

[Jan Kiszka]

Do not bail out on LDT selectors that match the reserved monitor GDT
selector range. At this chance, improve the related panic message.

Signed-off-by: Jan Kiszka <address@hidden>
---

 common/interp.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/common/interp.c b/common/interp.c
index 088d2b2..4c042e9 100644
--- a/common/interp.c
+++ b/common/interp.c
@@ -775,9 +775,12 @@ static void load_seg_desc(struct kqemu_state *s,
 #ifdef DEBUG_SEG
     monitor_log(s, "load_seg_desc: reg=%d sel=0x%04x\n", seg_reg, selector);
 #endif
-    if (selector >= s->monitor_selector_base &&
+    if (!(selector & 0x4) && selector >= s->monitor_selector_base &&
         selector <= (s->monitor_selector_base + MONITOR_SEL_RANGE)) {
-        monitor_panic(s, "Trying to load a reserved selector\n");
+        monitor_panic(s, "Trying to load a reserved selector "
+                         "(reg=%d sel=0x%04x cs:ip=%04x:" FMT_lx ")\n",
+                      seg_reg, selector, env->segs[R_CS].selector,
+                      (unsigned long)env->eip);
     }
 
     if ((selector & 0xfffc) == 0) {