[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/2] linux-user: Use g_try_malloc() in do_msgrcv()
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PATCH 2/2] linux-user: Use g_try_malloc() in do_msgrcv() |
Date: |
Fri, 20 May 2016 19:00:57 +0100 |
In do_msgrcv() we want to allocate a message buffer, whose size
is passed to us by the guest. That means we could legitimately
fail, so use g_try_malloc() and handle the error case, in the same
way that do_msgsnd() does.
Signed-off-by: Peter Maydell <address@hidden>
---
linux-user/syscall.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 0becbe4..ae81473 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -3110,7 +3110,11 @@ static inline abi_long do_msgrcv(int msqid, abi_long
msgp,
if (!lock_user_struct(VERIFY_WRITE, target_mb, msgp, 0))
return -TARGET_EFAULT;
- host_mb = g_malloc(msgsz+sizeof(long));
+ host_mb = g_try_malloc(msgsz + sizeof(long));
+ if (!host_mb) {
+ ret = -TARGET_ENOMEM;
+ goto end;
+ }
ret = get_errno(msgrcv(msqid, host_mb, msgsz, msgtyp, msgflg));
if (ret > 0) {
--
1.9.1