* grub-core/commands/hdparm.c (le16_to_char): Make src and dest uint16 *
to ensure alignment. (grub_hdparm_print_identify): Make argument uint16 * to ensure alignment. Ensure tmp alignment. (grub_cmd_hdparm): Ensure buf alignment. * grub-core/disk/ata.c (grub_ata_strncpy): Make src and dest uint16 * to ensure alignment. (grub_ata_dumpinfo): Ensure text alignment. (grub_atapi_identify): Preserve alignment invariant. (grub_ata_identify): Likewise. Use grub_get_unaligned32 when necessary.
This commit is contained in:
Vladimir 'phcoder' Serbinenko
parent
0d51ee20ee
commit
6166442083
3 changed files with 45 additions and 34 deletions
13
ChangeLog
13
ChangeLog
|
|
@ -1,3 +1,16 @@
|
|||
2011-12-13 Vladimir Serbinenko <phcoder@gmail.com>
|
||||
|
||||
* grub-core/commands/hdparm.c (le16_to_char): Make src and dest uint16 *
|
||||
to ensure alignment.
|
||||
(grub_hdparm_print_identify): Make argument uint16 * to ensure
|
||||
alignment. Ensure tmp alignment.
|
||||
(grub_cmd_hdparm): Ensure buf alignment.
|
||||
* grub-core/disk/ata.c (grub_ata_strncpy): Make src and dest uint16 *
|
||||
to ensure alignment.
|
||||
(grub_ata_dumpinfo): Ensure text alignment.
|
||||
(grub_atapi_identify): Preserve alignment invariant.
|
||||
(grub_ata_identify): Likewise. Use grub_get_unaligned32 when necessary.
|
||||
|
||||
2011-12-13 Vladimir Serbinenko <phcoder@gmail.com>
|
||||
|
||||
* include/grub/emu/misc.h (xasprintf): Add missing format attribute.
|
||||
|
|
|
|||
|
|
@ -165,22 +165,20 @@ grub_hdparm_set_val_cmd (const char * msg, int val,
|
|||
}
|
||||
|
||||
static const char *
|
||||
le16_to_char (char *dest, const grub_uint16_t * src16, unsigned bytes)
|
||||
le16_to_char (grub_uint16_t *dest, const grub_uint16_t * src16, unsigned bytes)
|
||||
{
|
||||
grub_uint16_t * dest16 = (grub_uint16_t *) dest;
|
||||
unsigned i;
|
||||
for (i = 0; i < bytes / 2; i++)
|
||||
dest16[i] = grub_be_to_cpu16 (src16[i]);
|
||||
return dest;
|
||||
dest[i] = grub_be_to_cpu16 (src16[i]);
|
||||
dest[i] = 0;
|
||||
return (char *) dest;
|
||||
}
|
||||
|
||||
static void
|
||||
grub_hdparm_print_identify (const char * idbuf)
|
||||
grub_hdparm_print_identify (const grub_uint16_t * idw)
|
||||
{
|
||||
const grub_uint16_t * idw = (const grub_uint16_t *) idbuf;
|
||||
|
||||
/* Print identity strings. */
|
||||
char tmp[40];
|
||||
grub_uint16_t tmp[21];
|
||||
grub_printf ("Model: \"%.40s\"\n", le16_to_char (tmp, &idw[27], 40));
|
||||
grub_printf ("Firmware: \"%.8s\"\n", le16_to_char (tmp, &idw[23], 8));
|
||||
grub_printf ("Serial: \"%.20s\"\n", le16_to_char (tmp, &idw[10], 20));
|
||||
|
|
@ -377,7 +375,7 @@ grub_cmd_hdparm (grub_extcmd_context_t ctxt, int argc, char **args) // state????
|
|||
/* Print/dump IDENTIFY. */
|
||||
if (ident || dumpid)
|
||||
{
|
||||
char buf[GRUB_DISK_SECTOR_SIZE];
|
||||
grub_uint16_t buf[GRUB_DISK_SECTOR_SIZE / 2];
|
||||
if (grub_hdparm_do_ata_cmd (ata, GRUB_ATA_CMD_IDENTIFY_DEVICE,
|
||||
0, 0, buf, sizeof (buf)))
|
||||
grub_printf ("Cannot read ATA IDENTIFY data\n");
|
||||
|
|
@ -386,7 +384,7 @@ grub_cmd_hdparm (grub_extcmd_context_t ctxt, int argc, char **args) // state????
|
|||
if (ident)
|
||||
grub_hdparm_print_identify (buf);
|
||||
if (dumpid)
|
||||
hexdump (0, buf, sizeof (buf));
|
||||
hexdump (0, (char *) buf, sizeof (buf));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -29,29 +29,27 @@ static grub_ata_dev_t grub_ata_dev_list;
|
|||
|
||||
/* Byteorder has to be changed before strings can be read. */
|
||||
static void
|
||||
grub_ata_strncpy (char *dst, char *src, grub_size_t len)
|
||||
grub_ata_strncpy (grub_uint16_t *dst16, grub_uint16_t *src16, grub_size_t len)
|
||||
{
|
||||
grub_uint16_t *src16 = (grub_uint16_t *) src;
|
||||
grub_uint16_t *dst16 = (grub_uint16_t *) dst;
|
||||
unsigned int i;
|
||||
|
||||
for (i = 0; i < len / 2; i++)
|
||||
*(dst16++) = grub_be_to_cpu16 (*(src16++));
|
||||
dst[len] = '\0';
|
||||
dst16[i] = 0;
|
||||
}
|
||||
|
||||
static void
|
||||
grub_ata_dumpinfo (struct grub_ata *dev, char *info)
|
||||
grub_ata_dumpinfo (struct grub_ata *dev, grub_uint16_t *info)
|
||||
{
|
||||
char text[41];
|
||||
grub_uint16_t text[21];
|
||||
|
||||
/* The device information was read, dump it for debugging. */
|
||||
grub_ata_strncpy (text, info + 20, 20);
|
||||
grub_dprintf ("ata", "Serial: %s\n", text);
|
||||
grub_ata_strncpy (text, info + 46, 8);
|
||||
grub_dprintf ("ata", "Firmware: %s\n", text);
|
||||
grub_ata_strncpy (text, info + 54, 40);
|
||||
grub_dprintf ("ata", "Model: %s\n", text);
|
||||
grub_ata_strncpy (text, info + 10, 20);
|
||||
grub_dprintf ("ata", "Serial: %s\n", (char *) text);
|
||||
grub_ata_strncpy (text, info + 23, 8);
|
||||
grub_dprintf ("ata", "Firmware: %s\n", (char *) text);
|
||||
grub_ata_strncpy (text, info + 27, 40);
|
||||
grub_dprintf ("ata", "Model: %s\n", (char *) text);
|
||||
|
||||
if (! dev->atapi)
|
||||
{
|
||||
|
|
@ -65,7 +63,7 @@ static grub_err_t
|
|||
grub_atapi_identify (struct grub_ata *dev)
|
||||
{
|
||||
struct grub_disk_ata_pass_through_parms parms;
|
||||
char *info;
|
||||
grub_uint16_t *info;
|
||||
grub_err_t err;
|
||||
|
||||
info = grub_malloc (GRUB_DISK_SECTOR_SIZE);
|
||||
|
|
@ -105,17 +103,19 @@ static grub_err_t
|
|||
grub_ata_identify (struct grub_ata *dev)
|
||||
{
|
||||
struct grub_disk_ata_pass_through_parms parms;
|
||||
char *info;
|
||||
grub_uint64_t *info64;
|
||||
grub_uint32_t *info32;
|
||||
grub_uint16_t *info16;
|
||||
grub_err_t err;
|
||||
|
||||
info = grub_malloc (GRUB_DISK_SECTOR_SIZE);
|
||||
if (! info)
|
||||
info64 = grub_malloc (GRUB_DISK_SECTOR_SIZE);
|
||||
info32 = (grub_uint32_t *) info64;
|
||||
info16 = (grub_uint16_t *) info64;
|
||||
if (! info16)
|
||||
return grub_errno;
|
||||
|
||||
info16 = (grub_uint16_t *) info;
|
||||
grub_memset (&parms, 0, sizeof (parms));
|
||||
parms.buffer = info;
|
||||
parms.buffer = info16;
|
||||
parms.size = GRUB_DISK_SECTOR_SIZE;
|
||||
parms.taskfile.disk = 0xE0;
|
||||
|
||||
|
|
@ -126,7 +126,7 @@ grub_ata_identify (struct grub_ata *dev)
|
|||
if (err || parms.size != GRUB_DISK_SECTOR_SIZE)
|
||||
{
|
||||
grub_uint8_t sts = parms.taskfile.status;
|
||||
grub_free (info);
|
||||
grub_free (info16);
|
||||
grub_errno = GRUB_ERR_NONE;
|
||||
if ((sts & (GRUB_ATA_STATUS_BUSY | GRUB_ATA_STATUS_DRQ
|
||||
| GRUB_ATA_STATUS_ERR)) == GRUB_ATA_STATUS_ERR
|
||||
|
|
@ -167,14 +167,14 @@ grub_ata_identify (struct grub_ata *dev)
|
|||
|
||||
/* Determine the amount of sectors. */
|
||||
if (dev->addr != GRUB_ATA_LBA48)
|
||||
dev->size = grub_le_to_cpu32(*((grub_uint32_t *) &info16[60]));
|
||||
dev->size = grub_le_to_cpu32 (info32[30]);
|
||||
else
|
||||
dev->size = grub_le_to_cpu64(*((grub_uint64_t *) &info16[100]));
|
||||
dev->size = grub_le_to_cpu64 (info64[25]);
|
||||
|
||||
if (info16[106] & (1 << 12))
|
||||
{
|
||||
grub_uint32_t secsize;
|
||||
secsize = grub_le_to_cpu32 (*((grub_uint32_t *) &info16[117]));
|
||||
secsize = grub_le_to_cpu32 (grub_get_unaligned32 (&info16[117]));
|
||||
if (secsize & (secsize - 1) || !secsize
|
||||
|| secsize > 1048576)
|
||||
secsize = 256;
|
||||
|
|
@ -191,9 +191,9 @@ grub_ata_identify (struct grub_ata *dev)
|
|||
dev->heads = info16[3];
|
||||
dev->sectors_per_track = info16[6];
|
||||
|
||||
grub_ata_dumpinfo (dev, info);
|
||||
grub_ata_dumpinfo (dev, info16);
|
||||
|
||||
grub_free(info);
|
||||
grub_free (info16);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue