From c068d37020f8c0d10beaf4671c41b05b923d7896 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Wed, 22 Aug 2012 13:55:56 +0200 Subject: softmmu-semi: fix lock_user* functions not to deref NULL upon OOM Return NULL upon malloc failure. Signed-off-by: Jim Meyering Signed-off-by: Anthony Liguori (cherry picked from commit 15d9e3bc6af8a56af8c61911aab8453a54795db1) Signed-off-by: Michael Roth --- softmmu-semi.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/softmmu-semi.h b/softmmu-semi.h index 648cb959d..bcb979a5b 100644 --- a/softmmu-semi.h +++ b/softmmu-semi.h @@ -40,7 +40,7 @@ static void *softmmu_lock_user(CPUArchState *env, uint32_t addr, uint32_t len, uint8_t *p; /* TODO: Make this something that isn't fixed size. */ p = malloc(len); - if (copy) + if (p && copy) cpu_memory_rw_debug(env, addr, p, len, 0); return p; } @@ -52,6 +52,9 @@ static char *softmmu_lock_user_string(CPUArchState *env, uint32_t addr) uint8_t c; /* TODO: Make this something that isn't fixed size. */ s = p = malloc(1024); + if (!s) { + return NULL; + } do { cpu_memory_rw_debug(env, addr, &c, 1, 0); addr++; -- cgit v1.2.3