From 29fb7562322d2f05df2c1f6d74c24cd24e034087 Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Mon, 28 Sep 2015 08:57:22 -0700 Subject: [PATCH] vtophys: avoid NULL dereference if malloc fails Change-Id: I5fd865d158716966de6baf5d9d45fbeb47c44e71 Signed-off-by: Daniel Verkamp --- lib/memory/vtophys.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/memory/vtophys.c b/lib/memory/vtophys.c index d6e86d608..f85466270 100644 --- a/lib/memory/vtophys.c +++ b/lib/memory/vtophys.c @@ -108,9 +108,11 @@ vtophys_get_map(uint64_t vfn_2mb) map_1gb = vtophys_map_128tb.map[idx_128tb]; if (!map_1gb) { map_1gb = malloc(sizeof(struct map_1gb)); - /* initialize all entries to all 0xFF (VTOPHYS_ERROR) */ - memset(map_1gb, 0xFF, sizeof(struct map_1gb)); - vtophys_map_128tb.map[idx_128tb] = map_1gb; + if (map_1gb) { + /* initialize all entries to all 0xFF (VTOPHYS_ERROR) */ + memset(map_1gb, 0xFF, sizeof(struct map_1gb)); + vtophys_map_128tb.map[idx_128tb] = map_1gb; + } } pthread_mutex_unlock(&vtophys_mutex);