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

bcm57xx: Actually write the stage1 version into the file

Browse Source
This commit is contained in:
Richard Hughes 2021-03-10 17:16:02 +00:00
parent 50d05164d3
commit 5f43586877
4 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
plugins/bcm57xx/fu-bcm57xx-stage1-image.c
View File

@ -45,6 +45,7 @@ fu_bcm57xx_stage1_image_parse (FuFirmware *image,
g_autofree gchar *tmp = NULL;
tmp = fu_common_version_from_uint32 (fwversion, FWUPD_VERSION_FORMAT_TRIPLET);
fu_firmware_set_version (image, tmp);
fu_firmware_set_version_raw (image, fwversion);
} else {
guint32 bufver[4] = { '\0' };
guint32 veraddr = 0x0;
@ -81,37 +82,45 @@ fu_bcm57xx_stage1_image_parse (FuFirmware *image,
}
static GBytes *
fu_bcm57xx_stage1_image_write (FuFirmware *image, GError **error)
fu_bcm57xx_stage1_image_write (FuFirmware *firmware, GError **error)
{
const guint8 *buf;
gsize bufsz = 0;
guint32 crc;
g_autoptr(GByteArray) blob = NULL;
g_autoptr(GByteArray) buf = g_byte_array_new ();
g_autoptr(GBytes) fw_nocrc = NULL;
g_autoptr(GBytes) fw_align = NULL;
/* get the CRC-less data */
fw_nocrc = fu_firmware_get_bytes (image, error);
/* the CRC-less payload */
fw_nocrc = fu_firmware_get_bytes (firmware, error);
if (fw_nocrc == NULL)
return NULL;
/* this has to be aligned by DWORDs */
fw_align = fu_common_bytes_align (fw_nocrc, sizeof(guint32), 0xff);
/* fuzzing, so write a header with the version */
if (g_bytes_get_size (fw_nocrc) < BCM_NVRAM_STAGE1_VERSION)
fu_byte_array_set_size (buf, BCM_NVRAM_STAGE1_VERSION + sizeof(guint32));
/* add to a mutable buffer */
buf = g_bytes_get_data (fw_align, &bufsz);
blob = g_byte_array_sized_new (bufsz + sizeof(guint32));
g_byte_array_append (blob, buf, bufsz);
/* payload */
fu_byte_array_append_bytes (buf, fw_nocrc);
/* update version */
if (!fu_common_write_uint32_safe (buf->data, buf->len, BCM_NVRAM_STAGE1_VERSION,
fu_firmware_get_version_raw (firmware),
G_BIG_ENDIAN, error))
return NULL;
/* align */
fu_byte_array_set_size (buf,
fu_common_align_up (g_bytes_get_size (fw_nocrc),
fu_firmware_get_alignment (firmware)));
/* add CRC */
crc = fu_bcm57xx_nvram_crc (buf, bufsz);
fu_byte_array_append_uint32 (blob, crc, G_LITTLE_ENDIAN);
return g_byte_array_free_to_bytes (g_steal_pointer (&blob));
crc = fu_bcm57xx_nvram_crc (buf->data, buf->len);
fu_byte_array_append_uint32 (buf, crc, G_LITTLE_ENDIAN);
return g_byte_array_free_to_bytes (g_steal_pointer (&buf));
}
static void
fu_bcm57xx_stage1_image_init (FuBcm57xxStage1Image *self)
{
fu_firmware_set_alignment (FU_FIRMWARE (self), 2);
}
static void

BIN
src/fuzzing/bcm57xx-stage1.bin
View File

Binary file not shown.

4
src/fuzzing/bcm57xx.builder.xml
View File

@ -1,10 +1,10 @@
<firmware gtype="FuBcm57xxFirmware">
<version>1.2.3</version>
<firmware gtype="FuBcm57xxStage1Image">
<version>7.8.9</version>
<version_raw>0x123456</version_raw>
<id>stage1</id>
<idx>0x01</idx>
<filename>bcm57xx-stage1.bin</filename>
<data>aGVsbG8gd29ybGQ=</data>
</firmware>
<firmware gtype="FuBcm57xxStage2Image">
<id>stage2</id>

BIN
src/fuzzing/firmware/bcm57xx.bin
View File

Binary file not shown.