Fix overflow in grub_util_get_fd_size for NetBSD.

diff --git a/ChangeLog b/ChangeLog
index 20e41b6efdde30368bc63118c9c22daf8b568102..e62028e8d39b5b0f08c65e69c0b93a25abadec12 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-06-25  Grégoire Sutre  <gregoire.sutre@gmail.com>
+
+       Fix overflow.
+
+       * grub-core/kern/emu/hostdisk.c (grub_util_get_fd_size)
+       [__NetBSD__]: Add explicit cast before bitshift.
+
 2012-06-23  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * configure.ac: Bump to 2.00~rc1.

diff --git a/grub-core/kern/emu/hostdisk.c b/grub-core/kern/emu/hostdisk.c
index 43db9d6ecaa11ecf13ec4dcc485a3a77108f1be5..b8c376643fe3acc34add95aad7df718c6d26724a 100644 (file)
--- a/grub-core/kern/emu/hostdisk.c
+++ b/grub-core/kern/emu/hostdisk.c
@@ -309,7 +309,7 @@ grub_util_get_fd_size (int fd, const char *name, unsigned *log_secsize)
 # if defined (__APPLE__)
     return nr << log_sector_size;
 # elif defined(__NetBSD__)
-    return label.d_secperunit << log_sector_size;
+    return (grub_uint64_t) label.d_secperunit << log_sector_size;
 # elif defined (__sun__)
     return minfo.dki_capacity << log_sector_size;
 # else