From b035f589401b0060771be432851c339843fffeca Mon Sep 17 00:00:00 2001 From: Zheng Bao Date: Thu, 27 May 2021 11:26:12 +0800 Subject: [PATCH] amdfwtool: Null check the pointers before using them BUG=b:188769922 Reported-by: Coverity (CID:1438963) Change-Id: Ia520e33c9e4065236478665fb0ef047fa47c9b81 Signed-off-by: Zheng Bao Reviewed-on: https://review.coreboot.org/c/coreboot/+/54999 Reviewed-by: Felix Held Tested-by: build bot (Jenkins) --- util/amdfwtool/amdfwtool.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/util/amdfwtool/amdfwtool.c b/util/amdfwtool/amdfwtool.c index 825dea6b64..1e75278b5e 100644 --- a/util/amdfwtool/amdfwtool.c +++ b/util/amdfwtool/amdfwtool.c @@ -397,10 +397,13 @@ static void fill_dir_header(void *directory, uint32_t count, uint32_t cookie, co if (!count) return; + if (ctx == NULL || directory == NULL) { + fprintf(stderr, "Calling %s with NULL pointers\n", __func__); + return; + } /* The table size needs to be 0x1000 aligned. So align the end of table. */ - if (ctx != NULL) - ctx->current = ALIGN(ctx->current, TABLE_ALIGNMENT); + ctx->current = ALIGN(ctx->current, TABLE_ALIGNMENT); switch (cookie) { case PSP2_COOKIE: