From 2629a2e2f1930029298dd12f996f7397b4f261d3 Mon Sep 17 00:00:00 2001 From: "Isaac J. Manjarres" Date: Thu, 2 Apr 2020 12:04:35 -0700 Subject: [PATCH] haven: Fix NULL pointer dereference in hh_rm_populate_mem_attr_desc() Use the locally calculated value of memory attribute entries when populating the memory attribute descriptor, instead of always dereferencing the client provided memory attribute descriptor, as clients may not always provide one. Change-Id: Ifbe586336e69e439ed404067616cce7515fd7953 Signed-off-by: Isaac J. Manjarres --- drivers/virt/haven/hh_rm_iface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/virt/haven/hh_rm_iface.c b/drivers/virt/haven/hh_rm_iface.c index 625e48518647..c7c88c03b98c 100644 --- a/drivers/virt/haven/hh_rm_iface.c +++ b/drivers/virt/haven/hh_rm_iface.c @@ -609,7 +609,7 @@ static void hh_rm_populate_mem_attr_desc(struct hh_mem_attr_desc *dst_desc, { u32 n_mem_attr_entries = src_desc ? src_desc->n_mem_attr_entries : 0; - dst_desc->n_mem_attr_entries = src_desc->n_mem_attr_entries; + dst_desc->n_mem_attr_entries = n_mem_attr_entries; if (n_mem_attr_entries) memcpy(dst_desc->attr_entries, src_desc->attr_entries, sizeof(*dst_desc->attr_entries) * n_mem_attr_entries);