diff --git a/ChangeLog b/ChangeLog
index 856e38f0a..078d2aecc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-05  Grégoire Sutre  <gregoire.sutre@gmail.com>
+
+	* grub-core/disk/diskfilter.c (grub_diskfilter_make_raid): Return
+	NULL when the argument `level' has an unexpected value.
+
 2012-02-04  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Move platform-dependent files from $prefix to $prefix/$platform.
diff --git a/grub-core/disk/diskfilter.c b/grub-core/disk/diskfilter.c
index da9377649..0354b9172 100644
--- a/grub-core/disk/diskfilter.c
+++ b/grub-core/disk/diskfilter.c
@@ -837,6 +837,9 @@ grub_diskfilter_make_raid (grub_size_t uuidlen, char *uuid, int nmemb,
     case 6:
       totsize = (nmemb - level / 3) * disk_size;
       break;
+
+    default:
+      return NULL;
     }
 
   array = grub_diskfilter_get_vg_by_uuid (uuidlen, uuid);