NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/bootgen: add patch to fix crash with -verify

Browse Source 
The 2023.2 version forgets to populate the iHT structure before accessing
it, leading to a segfault. Add a patch submitted upstream to fix that.

Notice that this is fixed in the 2024.1 version as there ReadBinaryFile()
now calls ReadHeaderTableDetails():

3a0f879c61 (diff-404aa20e03f1035b725ac1ea6e64c28477bb65c1663da67f64ffdb1a60552cee)

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Reviewed-by: Neal Frager <neal.frager@amd.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Peter Korsgaard 2024-10-23 15:09:11 +02:00
parent 8824652187
commit 7cb57554b8
1 changed files with 50 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
package/bootgen/0001-verifyimage-Fix-segmentation-fault-that-occurs-durin.patch Normal file
View File

@ -0,0 +1,50 @@
From f7825edbd1c85380cfb5ef0cf2c16c910954f57c Mon Sep 17 00:00:00 2001
From: Charlie Johnston <charlie.johnston@loftorbital.com>
Date: Mon, 5 Aug 2024 13:07:25 -0700
Subject: [PATCH] verifyimage: Fix segmentation fault that occurs during
verifyimage.
In commit d02322b, the behavior of ReadBinaryFile was changed such
that it no longer populated iHT. This caused VerifyAuthentication
to access a null iHT value resulting a segmentation fault.
This fix changes VerifyAuthentication to call ReadHeaderTableDetails
instead, where the old functionality of ReadBinaryFile now lives.
Signed-off-by: Charlie Johnston <charlie.johnston@loftorbital.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Upstream: https://github.com/Xilinx/bootgen/pull/36
---
verifyimage-versal.cpp | 2 +-
verifyimage-zynqmp.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/verifyimage-versal.cpp b/verifyimage-versal.cpp
index 5490663..5656e50 100755
--- a/verifyimage-versal.cpp
+++ b/verifyimage-versal.cpp
@@ -34,7 +34,7 @@
/*******************************************************************************/
void VersalReadImage::VerifyAuthentication(bool verifyImageOption)
{
- ReadBinaryFile();
+ ReadHeaderTableDetails();
if (iHT->headerAuthCertificateWordOffset != 0)
{
diff --git a/verifyimage-zynqmp.cpp b/verifyimage-zynqmp.cpp
index d4812e6..d73272c 100755
--- a/verifyimage-zynqmp.cpp
+++ b/verifyimage-zynqmp.cpp
@@ -50,7 +50,7 @@ static void RearrangeEndianess(uint8_t *array, uint32_t size)
/*******************************************************************************/
void ZynqMpReadImage::VerifyAuthentication(bool verifyImageOption)
{
- ReadBinaryFile();
+ ReadHeaderTableDetails();
if (iHT->headerAuthCertificateWordOffset != 0)
{
--
2.39.5