vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix overflow in grub_util_get_fd_size for NetBSD.

Browse source
This commit is contained in:
Grégoire Sutre 2012-06-25 10:09:57 +02:00
parent 8a4d6a445b
commit 650cfcfea2
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -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> 2012-06-23 Vladimir Serbinenko <phcoder@gmail.com>
* configure.ac: Bump to 2.00~rc1. * configure.ac: Bump to 2.00~rc1.

2
grub-core/kern/emu/hostdisk.c
View file

@ -309,7 +309,7 @@ grub_util_get_fd_size (int fd, const char *name, unsigned *log_secsize)
# if defined (__APPLE__) # if defined (__APPLE__)
return nr << log_sector_size; return nr << log_sector_size;
# elif defined(__NetBSD__) # elif defined(__NetBSD__)
return label.d_secperunit << log_sector_size; return (grub_uint64_t) label.d_secperunit << log_sector_size;
# elif defined (__sun__) # elif defined (__sun__)
return minfo.dki_capacity << log_sector_size; return minfo.dki_capacity << log_sector_size;
# else # else