From patchwork Mon Jan 13 10:58:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin Ian King X-Patchwork-Id: 1222077 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=fwts-devel-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47x9Yr1GLRz9sQp; Mon, 13 Jan 2020 21:58:39 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1iqxQZ-0005jr-TL; Mon, 13 Jan 2020 10:58:35 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1iqxQX-0005jl-Ty for fwts-devel@lists.ubuntu.com; Mon, 13 Jan 2020 10:58:33 +0000 Received: from 1.general.cking.uk.vpn ([10.172.193.212] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1iqxQX-00045E-K8; Mon, 13 Jan 2020 10:58:33 +0000 From: Colin King To: fwts-devel@lists.ubuntu.com Subject: [PATCH] lib: fwts_memorymap: check for memory allocation failure on object entry Date: Mon, 13 Jan 2020 10:58:33 +0000 Message-Id: <20200113105833.164218-1-colin.king@canonical.com> X-Mailer: git-send-email 2.24.0 MIME-Version: 1.0 X-BeenThere: fwts-devel@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Firmware Test Suite Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: fwts-devel-bounces@lists.ubuntu.com Sender: "fwts-devel" From: Colin Ian King The call to fwts_memory_map_table_read_entry may return NULL on a memory allocation failure, so check for this and if we have a failure then free up the list and return NULL to indicate an error. Addresses-Coverity: ("Dereference null return") Fixes: c34024b06890 ("lib: e820: load e820 info from /sys/firmware/memmap") Signed-off-by: Colin Ian King Acked-by: Alex Hung Acked-by: Ivan Hu --- src/lib/src/fwts_memorymap.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/lib/src/fwts_memorymap.c b/src/lib/src/fwts_memorymap.c index bbf8d57c..241b552e 100644 --- a/src/lib/src/fwts_memorymap.c +++ b/src/lib/src/fwts_memorymap.c @@ -310,7 +310,13 @@ fwts_list *fwts_memory_map_table_load(fwts_framework *fw) while ((directory = readdir(dir)) != NULL) { if (strncmp(directory->d_name, ".", 1)) { - fwts_memory_map_entry *entry = fwts_memory_map_table_read_entry(directory->d_name); + fwts_memory_map_entry *entry; + + entry = fwts_memory_map_table_read_entry(directory->d_name); + if (!entry) { + fwts_memory_map_table_free(memory_map_list); + return NULL; + } fwts_list_add_ordered(memory_map_list, entry, fwts_fwts_memory_map_entry_compare); } }