Skip to contentSkip to conversation

Fix overflow in grub_util_get_fd_size for NetBSD

PATCH In review Grégoire Sutre 2 participants 3 messages Jun 24, 2012 – Jun 25, 2012

lore
Share & tools
lore

Grégoire Sutre

author
#0 lore raw

PATCH 1/1 Fix overflow in grub_util_get_fd_size for NetBSD

Hi,

The attached patch fixes grub-probe for NetBSD (the issue was introduced in commit 4068).

Grégoire

=== modified file 'ChangeLog'

ChangeLog +7 -0
@@ -1,3 +1,10 @@
+2012-06-24  Grégoire Sutre  <[email protected]>
+
+	Fix overflow.
+
+	* grub-core/kern/emu/hostdisk.c (grub_util_get_fd_size)
+	[__NetBSD__]: Add explicit cast before bitshift.
+
 2012-06-23  Vladimir Serbinenko  <[email protected]>
 
 	* configure.ac: Bump to 2.00~rc1.

=== modified file 'grub-core/kern/emu/hostdisk.c'

kern/emu/hostdisk.c +1 -1
@@ -309,7 +309,7 @@
 # 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
#1 lore raw

kern/emu/hostdisk.c line 312

Quoted 2 lines · Grégoire Sutre
kern/emu/hostdisk.c +1 -1
-    return label.d_secperunit << log_sector_size;
+    return (grub_uint64_t)label.d_secperunit << log_sector_size;

Please add a space after ). Otherwise go ahead.

Signature · 2 lines
Regards
Vladimir 'φ-coder/phcoder' Serbinenko
author
#2 lore raw
Quoted 6 lines · Vladimir 'φ-coder/phcoder' Serbinenko

Review

Quoted 2 lines · Grégoire Sutre
(quoted diff) +1 -1
-    return label.d_secperunit<<  log_sector_size;
+    return (grub_uint64_t)label.d_secperunit<<  log_sector_size;

Please add a space after ). Otherwise go ahead.

Done.

Grégoire