From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Thu, 16 Jul 2015 08:59:33 +0000 (+0200)
Subject: grub_ext2_read_block: Fix return type on error.
X-Git-Tag: 2.02-beta3~255
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54e7dbbcb93b913514e3e9f8f29e6372ea34ff32;p=thirdparty%2Fgrub.git

grub_ext2_read_block: Fix return type on error.
---

diff --git a/grub-core/fs/ext2.c b/grub-core/fs/ext2.c
index 5199cb0c1..cdce63bcc 100644
--- a/grub-core/fs/ext2.c
+++ b/grub-core/fs/ext2.c
@@ -538,8 +538,9 @@ grub_ext2_read_block (grub_fshelp_node_t node, grub_disk_addr_t fileblock)
       shift = 2;
       goto indirect;
     }
-  return grub_error (GRUB_ERR_BAD_FS,
-		     "ext2fs doesn't support quadruple indirect blocks");
+  grub_error (GRUB_ERR_BAD_FS,
+	      "ext2fs doesn't support quadruple indirect blocks");
+  return -1;
 
 indirect:
   do {
@@ -554,7 +555,7 @@ indirect:
 			 & ((1 << log_perblock) - 1))
 			* sizeof (indir),
 			sizeof (indir), &indir))
-      return grub_errno;
+      return -1;
   } while (shift--);
 
   return grub_le_to_cpu32 (indir);