* grub-core/fs/zfs/zfs.c (read_dva): Issue an error if read failed

	with no error set.

diff --git a/ChangeLog b/ChangeLog
index b7bd30183339b840c168d51d2bec2f28883b4a3d..f8f4241764331d6f5239d71f7a32c474c347961c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-08  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/fs/zfs/zfs.c (read_dva): Issue an error if read failed
+       with no error set.
+
 2011-11-08  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/lib/LzmaEnc.c (LzmaEnc_CodeOneBlock): Remove set but not

diff --git a/grub-core/fs/zfs/zfs.c b/grub-core/fs/zfs/zfs.c
index fb16a009bb5bc8189de7c6cd8be3a0326aad9c6a..f85d56e99b5fe25b1110cfc86041ee5f0ea90e94 100644 (file)
--- a/grub-core/fs/zfs/zfs.c
+++ b/grub-core/fs/zfs/zfs.c
@@ -1324,7 +1324,7 @@ read_dva (const dva_t *dva,
 {
   grub_uint64_t offset;
   unsigned i;
-  grub_err_t err;
+  grub_err_t err = 0;
   int try = 0;
   offset = dva_get_offset (dva, endian);
 
@@ -1344,6 +1344,9 @@ read_dva (const dva_t *dva,
       if (err)
        return err;
     }
+  if (!err)
+    return grub_error (GRUB_ERR_BAD_FS, "unknown device %d",
+                      (int) DVA_GET_VDEV (dva));
   return err;
 }