From: Julien Grall <julien.grall@arm.com>
Date: Fri, 4 Oct 2019 16:53:26 +0000 (+0100)
Subject: xen/xsm: flask: Check xmalloc_array() return in security_sid_to_context()
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=4a647ad128a6e8ea91e9df140708d80548bf47f7;p=people%2Flarsk%2Fxen.git

xen/xsm: flask: Check xmalloc_array() return in security_sid_to_context()

xmalloc_array() may return NULL if there are memory. Rather than trying
to deference it directly, we should check the return value first.

Coverity-ID: 1381852
Signed-off-by: Julien Grall <julien.grall@arm.com>
Acked-by: Daniel De Graaf <dgdegra@tycho.nsa.gov>
Release-acked-by: Juergen Gross <jgross@suse.com>
---

diff --git a/xen/xsm/flask/ss/services.c b/xen/xsm/flask/ss/services.c
index b59928ea8a..42686535f2 100644
--- a/xen/xsm/flask/ss/services.c
+++ b/xen/xsm/flask/ss/services.c
@@ -775,6 +775,8 @@ int security_sid_to_context(u32 sid, char **scontext, u32 *scontext_len)
 
             *scontext_len = strlen(initial_sid_to_string[sid]) + 1;
             scontextp = xmalloc_array(char, *scontext_len);
+            if ( !scontextp )
+                return -ENOMEM;
             strlcpy(scontextp, initial_sid_to_string[sid], *scontext_len);
             *scontext = scontextp;
             goto out;