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

* grub-core/kern/disk.c: Fix potential overflow.

Browse source
This commit is contained in:
Vladimir Serbinenko 2013-12-21 13:23:37 +01:00
parent 0438ebf1c3
commit 2f9c48041a
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2013-12-21 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/kern/disk.c: Fix potential overflow.
2013-12-21 Vladimir Serbinenko <phcoder@gmail.com> 2013-12-21 Vladimir Serbinenko <phcoder@gmail.com>
* conf/Makefile.common: Don't include non-existing directory * conf/Makefile.common: Don't include non-existing directory

14
grub-core/kern/disk.c
View file

@ -342,9 +342,9 @@ grub_disk_read_small_real (grub_disk_t disk, grub_disk_addr_t sector,
{ {
grub_err_t err; grub_err_t err;
err = (disk->dev->read) (disk, transform_sector (disk, sector), err = (disk->dev->read) (disk, transform_sector (disk, sector),
1 << (GRUB_DISK_CACHE_BITS 1U << (GRUB_DISK_CACHE_BITS
+ GRUB_DISK_SECTOR_BITS + GRUB_DISK_SECTOR_BITS
- disk->log_sector_size), tmp_buf); - disk->log_sector_size), tmp_buf);
if (!err) if (!err)
{ {
/* Copy it and store it in the disk cache. */ /* Copy it and store it in the disk cache. */
@ -366,11 +366,11 @@ grub_disk_read_small_real (grub_disk_t disk, grub_disk_addr_t sector,
sector += (offset >> GRUB_DISK_SECTOR_BITS); sector += (offset >> GRUB_DISK_SECTOR_BITS);
offset &= ((1 << GRUB_DISK_SECTOR_BITS) - 1); offset &= ((1 << GRUB_DISK_SECTOR_BITS) - 1);
aligned_sector = (sector & ~((1 << (disk->log_sector_size aligned_sector = (sector & ~((1ULL << (disk->log_sector_size
- GRUB_DISK_SECTOR_BITS)) - GRUB_DISK_SECTOR_BITS))
- 1)); - 1));
offset += ((sector - aligned_sector) << GRUB_DISK_SECTOR_BITS); offset += ((sector - aligned_sector) << GRUB_DISK_SECTOR_BITS);
num = ((size + offset + (1 << (disk->log_sector_size)) num = ((size + offset + (1ULL << (disk->log_sector_size))
- 1) >> (disk->log_sector_size)); - 1) >> (disk->log_sector_size));
tmp_buf = grub_malloc (num << disk->log_sector_size); tmp_buf = grub_malloc (num << disk->log_sector_size);
@ -431,7 +431,7 @@ grub_disk_read (grub_disk_t disk, grub_disk_addr_t sector,
grub_err_t err; grub_err_t err;
grub_size_t len; grub_size_t len;
start_sector = sector & ~(GRUB_DISK_CACHE_SIZE - 1); start_sector = sector & ~((grub_disk_addr_t) GRUB_DISK_CACHE_SIZE - 1);
pos = (sector - start_sector) << GRUB_DISK_SECTOR_BITS; pos = (sector - start_sector) << GRUB_DISK_SECTOR_BITS;
len = ((GRUB_DISK_SECTOR_SIZE << GRUB_DISK_CACHE_BITS) len = ((GRUB_DISK_SECTOR_SIZE << GRUB_DISK_CACHE_BITS)
- pos - offset); - pos - offset);