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

* grub-core/disk/pata.c (grub_pata_pio_read): Handle unaligned buffer.

Browse source 
(grub_pata_pio_write): Likewise.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2011-12-13 15:55:36 +01:00
parent 02a2bf8384
commit b70b6d1107
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2011-12-13 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/disk/pata.c (grub_pata_pio_read): Handle unaligned buffer.
(grub_pata_pio_write): Likewise.
2011-12-13 Vladimir Serbinenko <phcoder@gmail.com> 2011-12-13 Vladimir Serbinenko <phcoder@gmail.com>
Add noreturn attributes and remove unreachable code. Add noreturn attributes and remove unreachable code.

8
grub-core/disk/pata.c
View file

@ -116,12 +116,13 @@ grub_pata_wait (void)
static void static void
grub_pata_pio_read (struct grub_pata_device *dev, char *buf, grub_size_t size) grub_pata_pio_read (struct grub_pata_device *dev, char *buf, grub_size_t size)
{ {
grub_uint16_t *buf16 = (grub_uint16_t *) buf;
unsigned int i; unsigned int i;
/* Read in the data, word by word. */ /* Read in the data, word by word. */
for (i = 0; i < size / 2; i++) for (i = 0; i < size / 2; i++)
buf16[i] = grub_le_to_cpu16 (grub_inw(dev->ioaddress + GRUB_ATA_REG_DATA)); grub_set_unaligned16 (buf + 2 * i,
grub_le_to_cpu16 (grub_inw(dev->ioaddress
+ GRUB_ATA_REG_DATA)));
if (size & 1) if (size & 1)
buf[size - 1] = (char) grub_le_to_cpu16 (grub_inw (dev->ioaddress buf[size - 1] = (char) grub_le_to_cpu16 (grub_inw (dev->ioaddress
+ GRUB_ATA_REG_DATA)); + GRUB_ATA_REG_DATA));
@ -130,12 +131,11 @@ grub_pata_pio_read (struct grub_pata_device *dev, char *buf, grub_size_t size)
static void static void
grub_pata_pio_write (struct grub_pata_device *dev, char *buf, grub_size_t size) grub_pata_pio_write (struct grub_pata_device *dev, char *buf, grub_size_t size)
{ {
grub_uint16_t *buf16 = (grub_uint16_t *) buf;
unsigned int i; unsigned int i;
/* Write the data, word by word. */ /* Write the data, word by word. */
for (i = 0; i < size / 2; i++) for (i = 0; i < size / 2; i++)
grub_outw(grub_cpu_to_le16 (buf16[i]), dev->ioaddress + GRUB_ATA_REG_DATA); grub_outw(grub_cpu_to_le16 (grub_get_unaligned16 (buf + 2 * i)), dev->ioaddress + GRUB_ATA_REG_DATA);
} }
/* ATA pass through support, used by hdparm.mod. */ /* ATA pass through support, used by hdparm.mod. */