4 files changed, 32 insertions, 13 deletions

diff --git a/drivers/mtd/chips/cfi_cmdset_0001.c b/drivers/mtd/chips/cfi_cmdset_0001.c
index 0cfcd88468e0..1e99dffcc6ae 100644
--- a/drivers/mtd/chips/cfi_cmdset_0001.c
+++ b/drivers/mtd/chips/cfi_cmdset_0001.c
@@ -4,7 +4,7 @@
  *
  * (C) 2000 Red Hat. GPL'd
  *
- * $Id: cfi_cmdset_0001.c,v 1.178 2005/05/19 17:05:43 nico Exp $
+ * $Id: cfi_cmdset_0001.c,v 1.180 2005/07/20 21:01:13 tpoynor Exp $
  *
  * 
  * 10/10/2000   Nicolas Pitre <nico@cam.org>
@@ -252,6 +252,15 @@ read_pri_intelext(struct map_info *map, __u16 adr)
         if (!extp)
                 return NULL;
 
+        if (extp->MajorVersion != '1' ||
+            (extp->MinorVersion < '0' || extp->MinorVersion > '3')) {
+                printk(KERN_ERR "  Unknown Intel/Sharp Extended Query "
+                       "version %c.%c.\n",  extp->MajorVersion,
+                       extp->MinorVersion);
+                kfree(extp);
+                return NULL;
+        }
+
         /* Do some byteswapping if necessary */
         extp->FeatureSupport = le32_to_cpu(extp->FeatureSupport);
         extp->BlkStatusRegMask = le16_to_cpu(extp->BlkStatusRegMask);
diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c
index 8505f118f2db..e3d31c749045 100644
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -17,7 +17,7 @@
  *
  * This code is GPL
  *
- * $Id: cfi_cmdset_0002.c,v 1.118 2005/07/04 22:34:29 gleixner Exp $
+ * $Id: cfi_cmdset_0002.c,v 1.120 2005/07/20 21:01:13 tpoynor Exp $
  *
  */
 
@@ -253,6 +253,16 @@ struct mtd_info *cfi_cmdset_0002(struct map_info *map, int primary)
                         return NULL;
                 }
 
+                if (extp->MajorVersion != '1' ||
+                    (extp->MinorVersion < '0' || extp->MinorVersion > '4')) {
+                        printk(KERN_ERR "  Unknown Amd/Fujitsu Extended Query "
+                               "version %c.%c.\n",  extp->MajorVersion,
+                               extp->MinorVersion);
+                        kfree(extp);
+                        kfree(mtd);
+                        return NULL;
+                }
+
                 /* Install our own private info structure */
                 cfi->cmdset_priv = extp;        
 
diff --git a/drivers/mtd/chips/cfi_cmdset_0020.c b/drivers/mtd/chips/cfi_cmdset_0020.c
index c894f8801578..d22df2d96788 100644
--- a/drivers/mtd/chips/cfi_cmdset_0020.c
+++ b/drivers/mtd/chips/cfi_cmdset_0020.c
@@ -4,7 +4,7 @@
  *
  * (C) 2000 Red Hat. GPL'd
  *
- * $Id: cfi_cmdset_0020.c,v 1.19 2005/07/13 15:52:45 dwmw2 Exp $
+ * $Id: cfi_cmdset_0020.c,v 1.20 2005/07/20 21:01:14 tpoynor Exp $
  * 
  * 10/10/2000   Nicolas Pitre <nico@cam.org>
  *      - completely revamped method functions so they are aware and
@@ -133,6 +133,15 @@ struct mtd_info *cfi_cmdset_0020(struct map_info *map, int primary)
                 if (!extp)
                         return NULL;
 
+                if (extp->MajorVersion != '1' ||
+                    (extp->MinorVersion < '0' || extp->MinorVersion > '3')) {
+                        printk(KERN_ERR "  Unknown ST Microelectronics"
+                               " Extended Query version %c.%c.\n",
+                               extp->MajorVersion, extp->MinorVersion);
+                        kfree(extp);
+                        return NULL;
+                }
+
                 /* Do some byteswapping if necessary */
                 extp->FeatureSupport = cfi32_to_cpu(extp->FeatureSupport);
                 extp->BlkStatusRegMask = cfi32_to_cpu(extp->BlkStatusRegMask);
diff --git a/drivers/mtd/chips/cfi_util.c b/drivers/mtd/chips/cfi_util.c
index 2b2ede2bfcca..0cf183f01e49 100644
--- a/drivers/mtd/chips/cfi_util.c
+++ b/drivers/mtd/chips/cfi_util.c
@@ -7,7 +7,7 @@
  *
  * This code is covered by the GPL.
  *
- * $Id: cfi_util.c,v 1.8 2004/12/14 19:55:56 nico Exp $
+ * $Id: cfi_util.c,v 1.9 2005/07/20 21:01:14 tpoynor Exp $
  *
  */
 
@@ -70,15 +70,6 @@ __xipram cfi_read_pri(struct map_info *map, __u16 adr, __u16 size, const char* n
         local_irq_enable();
 #endif
 
-        if (extp->MajorVersion != '1' || 
-            (extp->MinorVersion < '0' || extp->MinorVersion > '3')) {
-                printk(KERN_WARNING "  Unknown %s Extended Query "
-                       "version %c.%c.\n",  name, extp->MajorVersion,
-                       extp->MinorVersion);
-                kfree(extp);
-                extp = NULL;
-        }
-
  out:   return extp;
 }