proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-08-15 13:59:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

acpi-phat: Fix a -Wcast-align issue detected with clang

Browse Source
This commit is contained in:
Richard Hughes 2021-07-01 09:32:06 +01:00
parent 1cee26eba9
commit 1de71f1191
1 changed files with 45 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
plugins/acpi-phat/fu-acpi-phat-health-record.c
View File

@ -45,9 +45,23 @@ fu_acpi_phat_health_record_parse (FuFirmware *firmware,
{ {
FuAcpiPhatHealthRecord *self = FU_ACPI_PHAT_HEALTH_RECORD (firmware); FuAcpiPhatHealthRecord *self = FU_ACPI_PHAT_HEALTH_RECORD (firmware);
gsize bufsz = 0; gsize bufsz = 0;
guint16 rcdlen = 0;
guint32 dataoff = 0x0;
const guint8 *buf = g_bytes_get_data (fw, &bufsz); const guint8 *buf = g_bytes_get_data (fw, &bufsz);
fwupd_guid_t guid = { 0x0 }; fwupd_guid_t guid = { 0x0 };
/* record length */
if (!fu_common_read_uint16_safe (buf, bufsz, 2, &rcdlen, G_LITTLE_ENDIAN, error))
return FALSE;
if (rcdlen != bufsz) {
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_INVALID_DATA,
"record length not valid: %" G_GUINT16_FORMAT,
rcdlen);
return FALSE;
}
/* am healthy */ /* am healthy */
if (!fu_common_read_uint8_safe (buf, bufsz, 7, &self->am_healthy, error)) if (!fu_common_read_uint8_safe (buf, bufsz, 7, &self->am_healthy, error))
return FALSE; return FALSE;
@ -59,12 +73,39 @@ fu_acpi_phat_health_record_parse (FuFirmware *firmware,
return FALSE; return FALSE;
self->guid = fwupd_guid_to_string (&guid, FWUPD_GUID_FLAG_MIXED_ENDIAN); self->guid = fwupd_guid_to_string (&guid, FWUPD_GUID_FLAG_MIXED_ENDIAN);
/* read the data offset to work out the size of the middle part */
if (!fu_common_read_uint32_safe (buf, bufsz, 24, &dataoff, G_LITTLE_ENDIAN, error))
return FALSE;
/* device path */ /* device path */
if (bufsz > 28) { if (bufsz > 28) {
self->device_path = g_utf16_to_utf8 ((const gunichar2 *) (buf + 28), gsize ubufsz; /* bytes */
(bufsz - 28) / 2, g_autofree gunichar2 *ubuf = NULL;
NULL, NULL,
error); /* header -> devicepath -> data */
if (dataoff == 0x0) {
ubufsz = bufsz - 28;
} else {
ubufsz = dataoff - 28;
}
/* check this is an even number of bytes */
if (ubufsz % 2 != 0) {
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_INVALID_DATA,
"device path not valid: %" G_GSIZE_FORMAT,
ubufsz);
return FALSE;
}
/* align and convert */
ubuf = g_new0 (gunichar2, ubufsz / 2);
if (!fu_memcpy_safe ((guint8 *) ubuf, ubufsz, 0x0, /* dst */
buf, bufsz, 28, /* src */
ubufsz, error))
return FALSE;
self->device_path = g_utf16_to_utf8 (ubuf, ubufsz / 2, NULL, NULL, error);
if (self->device_path == NULL) if (self->device_path == NULL)
return FALSE; return FALSE;
} }