Skip to contentSkip to conversation

target/i386: Suppress coverity warning on fsave/frstor

PATCH In review Richard Henderson 2 participants 3 messages Apr 1, 2022 – Apr 27, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 target/i386: Suppress coverity warning on fsave/frstor

Coverity warns that 14 << data32 may overflow with respect to the target_ulong to which it is subsequently added. We know this wasn't true because data32 is in [1,2], but the suggested fix is perfectly fine.

Fixes Coverity CID 1487135, 1487256
---
 target/i386/tcg/fpu_helper.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
target/i386/tcg/fpu_helper.c +2 -2
index ebf5e73df9..30bc44fcf8 100644
@@ -2466,7 +2466,7 @@ static void do_fsave(CPUX86State *env, target_ulong ptr, int data32,
 
     do_fstenv(env, ptr, data32, retaddr);
 
-    ptr += (14 << data32);
+    ptr += (target_ulong)14 << data32;
     for (i = 0; i < 8; i++) {
         tmp = ST(i);
         do_fstt(env, tmp, ptr, retaddr);
@@ -2488,7 +2488,7 @@ static void do_frstor(CPUX86State *env, target_ulong ptr, int data32,
     int i;
 
     do_fldenv(env, ptr, data32, retaddr);
-    ptr += (14 << data32);
+    ptr += (target_ulong)14 << data32;
 
     for (i = 0; i < 8; i++) {
         tmp = do_fldt(env, ptr, retaddr);
Signature · 1 line
2.25.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 25 lines · Richard Henderson

Coverity warns that 14 << data32 may overflow with respect to the target_ulong to which it is subsequently added. We know this wasn't true because data32 is in [1,2], but the suggested fix is perfectly fine.

Fixes Coverity CID 1487135, 1487256
---
  target/i386/tcg/fpu_helper.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
target/i386/tcg/fpu_helper.c +1 -1
index ebf5e73df9..30bc44fcf8 100644
@@ -2466,7 +2466,7 @@ static void do_fsave(CPUX86State *env, target_ulong ptr, int data32,
 
      do_fstenv(env, ptr, data32, retaddr);
 
-    ptr += (14 << data32);
+    ptr += (target_ulong)14 << data32;
      for (i = 0; i < 8; i++) {
          tmp = ST(i);
          do_fstt(env, tmp, ptr, retaddr);

target/i386/tcg/fpu_helper.c static void do_frstor(CPUX86State *env, target_ulong ptr, int data32, · line 2494

Quoted 8 lines
target/i386/tcg/fpu_helper.c +1 -1
@@ -2488,7 +2488,7 @@ static void do_frstor(CPUX86State *env, target_ulong ptr, int data32,
      int i;
 
      do_fldenv(env, ptr, data32, retaddr);
-    ptr += (14 << data32);
+    ptr += (target_ulong)14 << data32;
 
      for (i = 0; i < 8; i++) {
          tmp = do_fldt(env, ptr, retaddr);
#2 lore raw
In reply to Richard Henderson
Quoted 25 lines · Richard Henderson

Coverity warns that 14 << data32 may overflow with respect to the target_ulong to which it is subsequently added. We know this wasn't true because data32 is in [1,2], but the suggested fix is perfectly fine.

Fixes Coverity CID 1487135, 1487256
---
  target/i386/tcg/fpu_helper.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
target/i386/tcg/fpu_helper.c +1 -1
index ebf5e73df9..30bc44fcf8 100644
@@ -2466,7 +2466,7 @@ static void do_fsave(CPUX86State *env, target_ulong ptr, int data32,
 
      do_fstenv(env, ptr, data32, retaddr);
 
-    ptr += (14 << data32);
+    ptr += (target_ulong)14 << data32;
      for (i = 0; i < 8; i++) {
          tmp = ST(i);
          do_fstt(env, tmp, ptr, retaddr);

target/i386/tcg/fpu_helper.c static void do_frstor(CPUX86State *env, target_ulong ptr, int data32, · line 2494

Quoted 8 lines
target/i386/tcg/fpu_helper.c +1 -1
@@ -2488,7 +2488,7 @@ static void do_frstor(CPUX86State *env, target_ulong ptr, int data32,
      int i;
 
      do_fldenv(env, ptr, data32, retaddr);
-    ptr += (14 << data32);
+    ptr += (target_ulong)14 << data32;
 
      for (i = 0; i < 8; i++) {
          tmp = do_fldt(env, ptr, retaddr);

Queuing to tcg-next.

r~