From: Andrew Cooper <andrew.cooper3@citrix.com>
Date: Tue, 3 Oct 2023 11:55:31 +0000 (+0100)
Subject: Fixes from Github Code Scanning
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=f91cd602586c28f76b04f20fe39c5f001d8d613a;p=xtf.git

Fixes from Github Code Scanning

In XSA-122, "Array offset used before range check".

In traps.c "Declaration hides variable".

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---

diff --git a/arch/x86/traps.c b/arch/x86/traps.c
index 4beb11e..1ea5dd1 100644
--- a/arch/x86/traps.c
+++ b/arch/x86/traps.c
@@ -46,7 +46,7 @@ void do_exception(struct cpu_regs *regs)
     /* Still unresolved? Give up and panic() with some relevent information. */
     if ( !safe )
     {
-        exinfo_t ex = EXINFO(regs->entry_vector, regs->error_code);
+        exinfo_t exc = EXINFO(regs->entry_vector, regs->error_code);
 
         if ( regs->entry_vector == X86_EXC_PF )
         {
@@ -54,12 +54,12 @@ void do_exception(struct cpu_regs *regs)
 
             panic("Unhandled exception at %04x:%p\n"
                   "Vec %u %pe %%cr2 %p\n",
-                  regs->cs, _p(regs->ip), regs->entry_vector, _p(ex), _p(cr2));
+                  regs->cs, _p(regs->ip), regs->entry_vector, _p(exc), _p(cr2));
         }
         else
             panic("Unhandled exception at %04x:%p\n"
                   "Vec %u %pe\n",
-                  regs->cs, _p(regs->ip), regs->entry_vector, _p(ex));
+                  regs->cs, _p(regs->ip), regs->entry_vector, _p(exc));
     }
 }
 
diff --git a/tests/xsa-122/main.c b/tests/xsa-122/main.c
index 2cffa52..2ae86a4 100644
--- a/tests/xsa-122/main.c
+++ b/tests/xsa-122/main.c
@@ -39,7 +39,7 @@ static void check_buffer(const char *ref, const char *buf, size_t buf_sz)
     else if ( str_len == buf_sz - 1 )
         return; /* No trailing space after data. */
 
-    for ( i = str_len + 1; buf[i] == '\0' && i < buf_sz; ++i )
+    for ( i = str_len + 1; i < buf_sz && buf[i] == '\0'; ++i )
         ; /* No action. */
 
     if ( i != buf_sz )