[Skiboot] [PATCH 3/7] hdata: Make hdata child accessors check the header
Nicholas Piggin
npiggin at gmail.com
Wed Sep 6 20:10:13 AEST 2023
Like other (idata) accessors already do, check the common header in
hdata child accessor calls.
Signed-off-by: Nicholas Piggin <npiggin at gmail.com>
---
hdata/hdif.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/hdata/hdif.c b/hdata/hdif.c
index 13c128c97..aba7f3660 100644
--- a/hdata/hdif.c
+++ b/hdata/hdif.c
@@ -157,6 +157,12 @@ HDIF_child_arr(const struct HDIF_common_hdr *hdif, unsigned int idx)
{
struct HDIF_child_ptr *children;
+ if (!HDIF_check(hdif, NULL)) {
+ prerror("HDIF: Bad header format !\n");
+ backtrace();
+ return NULL;
+ }
+
children = (void *)hdif + be32_to_cpu(hdif->child_off);
if (idx >= be16_to_cpu(hdif->child_count)) {
@@ -177,6 +183,12 @@ struct HDIF_common_hdr *HDIF_child(const struct HDIF_common_hdr *hdif,
struct HDIF_common_hdr *ret;
long child_off;
+ if (!HDIF_check(hdif, NULL)) {
+ prerror("HDIF: Bad header format !\n");
+ backtrace();
+ return NULL;
+ }
+
/* child must be in hdif's child array */
child_off = (void *)child - (base + be32_to_cpu(hdif->child_off));
assert(child_off % sizeof(struct HDIF_child_ptr) == 0);
--
2.40.1
More information about the Skiboot
mailing list