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

synaptics-rmi: Never create a zero-sized v10 container

Browse Source
This commit is contained in:
Richard Hughes 2021-03-10 20:15:00 +00:00
parent db38dca4c8
commit 2667e4bdc1
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/synaptics-rmi/fu-synaptics-rmi-firmware.c
View File

@ -558,7 +558,7 @@ static GBytes *
fu_synaptics_rmi_firmware_write_v10 (FuFirmware *firmware, GError **error) fu_synaptics_rmi_firmware_write_v10 (FuFirmware *firmware, GError **error)
{ {
FuSynapticsRmiFirmware *self = FU_SYNAPTICS_RMI_FIRMWARE (firmware); FuSynapticsRmiFirmware *self = FU_SYNAPTICS_RMI_FIRMWARE (firmware);
gsize bufsz = 0; gsize bufsz;
guint32 csum; guint32 csum;
g_autoptr(FuFirmware) img = NULL; g_autoptr(FuFirmware) img = NULL;
g_autoptr(GByteArray) buf = g_byte_array_new (); g_autoptr(GByteArray) buf = g_byte_array_new ();
@ -574,7 +574,7 @@ fu_synaptics_rmi_firmware_write_v10 (FuFirmware *firmware, GError **error)
guint32 offset_table[] = { RMI_IMG_FW_OFFSET + 0x24 }; /* offset to first RmiFirmwareContainerDescriptor */ guint32 offset_table[] = { RMI_IMG_FW_OFFSET + 0x24 }; /* offset to first RmiFirmwareContainerDescriptor */
RmiFirmwareContainerDescriptor desc = { RmiFirmwareContainerDescriptor desc = {
.container_id = GUINT16_TO_LE(RMI_FIRMWARE_CONTAINER_ID_FLASH_CONFIG), .container_id = GUINT16_TO_LE(RMI_FIRMWARE_CONTAINER_ID_FLASH_CONFIG),
.content_length = GUINT32_TO_LE(bufsz), .content_length = 0x0,
.content_address = GUINT32_TO_LE(RMI_IMG_FW_OFFSET + 0x44), .content_address = GUINT32_TO_LE(RMI_IMG_FW_OFFSET + 0x44),
}; };
@ -586,6 +586,7 @@ fu_synaptics_rmi_firmware_write_v10 (FuFirmware *firmware, GError **error)
if (buf_blob == NULL) if (buf_blob == NULL)
return NULL; return NULL;
bufsz = g_bytes_get_size (buf_blob); bufsz = g_bytes_get_size (buf_blob);
desc.content_length = GUINT32_TO_LE(bufsz);
/* create empty block */ /* create empty block */
fu_byte_array_set_size (buf, RMI_IMG_FW_OFFSET + 0x48); fu_byte_array_set_size (buf, RMI_IMG_FW_OFFSET + 0x48);