From ade53aa53ab6e1f3028e92bbb8f962339eef56a5 Mon Sep 17 00:00:00 2001 From: Yonghua Huang Date: Sun, 27 Sep 2020 14:50:16 +0800 Subject: [PATCH] hv: fix potential NULL pointer dereference in 'memcpy_s' 'd' should be checked before calling 'memset()'. Tracked-On: #5359 Signed-off-by: Yonghua Huang --- hypervisor/arch/x86/lib/memory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hypervisor/arch/x86/lib/memory.c b/hypervisor/arch/x86/lib/memory.c index 5e31c2079..b7157c5a8 100644 --- a/hypervisor/arch/x86/lib/memory.c +++ b/hypervisor/arch/x86/lib/memory.c @@ -53,7 +53,7 @@ int32_t memcpy_s(void *d, size_t dmax, const void *s, size_t slen) memcpy_erms(d, s, slen); } ret = 0; - } else { + } else if (d != NULL) { (void)memset(d, 0U, dmax); }