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

Fixed a cache collision bug. Thanks guufy1 for bugreport and test

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2011-06-23 09:39:12 +02:00
parent 77ba5392d0
commit 2df2e89fee
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -544,6 +544,17 @@ grub_disk_read (grub_disk_t disk, grub_disk_addr_t sector,
break; break;
} }
if (data)
{
grub_memcpy ((char *) buf
+ (agglomerate << (GRUB_DISK_CACHE_BITS
+ GRUB_DISK_SECTOR_BITS)),
data, GRUB_DISK_CACHE_SIZE << GRUB_DISK_SECTOR_BITS);
grub_disk_cache_unlock (disk->dev->id, disk->id,
sector + (agglomerate
<< GRUB_DISK_CACHE_BITS));
}
if (agglomerate) if (agglomerate)
{ {
grub_disk_addr_t i; grub_disk_addr_t i;
@ -568,17 +579,12 @@ grub_disk_read (grub_disk_t disk, grub_disk_addr_t sector,
buf = (char *) buf buf = (char *) buf
+ (agglomerate << (GRUB_DISK_CACHE_BITS + GRUB_DISK_SECTOR_BITS)); + (agglomerate << (GRUB_DISK_CACHE_BITS + GRUB_DISK_SECTOR_BITS));
} }
if (data) if (data)
{ {
grub_memcpy (buf, data,
GRUB_DISK_CACHE_SIZE << GRUB_DISK_SECTOR_BITS);
sector += GRUB_DISK_CACHE_SIZE; sector += GRUB_DISK_CACHE_SIZE;
buf = (char *) buf + (GRUB_DISK_CACHE_SIZE << GRUB_DISK_SECTOR_BITS); buf = (char *) buf + (GRUB_DISK_CACHE_SIZE << GRUB_DISK_SECTOR_BITS);
size -= (GRUB_DISK_CACHE_SIZE << GRUB_DISK_SECTOR_BITS); size -= (GRUB_DISK_CACHE_SIZE << GRUB_DISK_SECTOR_BITS);
grub_disk_cache_unlock (disk->dev->id, disk->id,
sector + (agglomerate
<< GRUB_DISK_CACHE_BITS));
} }
} }