[Qemu-devel] [PATCH] hw/pflash_cfi01.c

[Thorsten Zitterell]

Patch to catch wrong/unknown command sequences.


Index: hw/pflash_cfi01.c
===================================================================
RCS file: /sources/qemu/qemu/hw/pflash_cfi01.c,v
retrieving revision 1.2
diff -u -r1.2 pflash_cfi01.c
--- hw/pflash_cfi01.c	17 Nov 2007 17:14:45 -0000	1.2
+++ hw/pflash_cfi01.c	17 Nov 2007 18:51:04 -0000
@@ -353,6 +353,8 @@
 
             pfl->counter--;
             break;
+        default:
+            goto error_flash;            
         }
         return;
     case 3: /* Confirm mode */
@@ -361,11 +363,14 @@
             if (cmd == 0xd0) {
                 pfl->wcycle = 0;
                 pfl->status |= 0x80;
-                break;
             } else {
                 DPRINTF("%s: unknown command for \"write block\"\n", __func__);
                 PFLASH_BUG("Write block confirm");
+                goto reset_flash;
             }
+            break;
+        default:
+            goto error_flash;            
         }
         return;
     default: