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

goodix-moc: Fix a potential crash when reading the USB request

Browse Source
This commit is contained in:
Richard Hughes 2020-12-08 15:59:45 +00:00
parent 84e8d24540
commit 7713ae676f
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
plugins/goodix-moc/fu-goodixmoc-device.c
View File

@ -91,6 +91,7 @@ goodixmoc_device_cmd_recv (GUsbDevice *usbdevice,
{ {
GxfpPkgHeader header = { 0 }; GxfpPkgHeader header = { 0 };
guint32 crc_actual = 0; guint32 crc_actual = 0;
guint32 crc_calculated = 0;
gsize actual_len = 0; gsize actual_len = 0;
gsize offset = 0; gsize offset = 0;
@ -131,11 +132,19 @@ goodixmoc_device_cmd_recv (GUsbDevice *usbdevice,
return FALSE; return FALSE;
offset = sizeof(header) + header.len; offset = sizeof(header) + header.len;
crc_actual = fu_common_crc32 (reply->data, offset); crc_actual = fu_common_crc32 (reply->data, offset);
if (crc_actual != GUINT32_FROM_LE(*(guint32 *)(reply->data + offset))) { if (!fu_common_read_uint32_safe (reply->data,
g_set_error_literal (error, reply->len,
offset,
&crc_calculated,
G_LITTLE_ENDIAN,
error))
return FALSE;
if (crc_actual != crc_calculated) {
g_set_error (error,
FWUPD_ERROR, FWUPD_ERROR,
FWUPD_ERROR_INTERNAL, FWUPD_ERROR_INTERNAL,
"invalid checksum"); "invalid checksum, got 0x%x, expected 0x%x",
crc_calculated, crc_actual);
return FALSE; return FALSE;
} }