From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46948) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XJTN4-0006B6-BG for qemu-devel@nongnu.org; Mon, 18 Aug 2014 16:17:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XJTMz-00006G-TO for qemu-devel@nongnu.org; Mon, 18 Aug 2014 16:17:38 -0400 Date: Mon, 18 Aug 2014 22:17:52 +0200 From: "Michael S. Tsirkin" Message-ID: <20140818201752.GC1121@redhat.com> References: <1408001361-13580-1-git-send-email-zhang.zhanghailiang@huawei.com> <1408001361-13580-8-git-send-email-zhang.zhanghailiang@huawei.com> <20140814133135.GB30317@afflict.kos.to> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20140814133135.GB30317@afflict.kos.to> Subject: Re: [Qemu-devel] [PATCH v6 07/10] linux-user: check return value of malloc() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Riku Voipio Cc: kwolf@redhat.com, lkurusa@redhat.com, zhanghailiang , qemu-trivial@nongnu.org, jan.kiszka@siemens.com, mjt@tls.msk.ru, qemu-devel@nongnu.org, peter.huangpeng@huawei.com, stefanha@redhat.com, luonengjun@huawei.com, pbonzini@redhat.com, lcapitulino@redhat.com, alex.bennee@linaro.org, rth@twiddle.net On Thu, Aug 14, 2014 at 04:31:35PM +0300, Riku Voipio wrote: > On Thu, Aug 14, 2014 at 03:29:18PM +0800, zhanghailiang wrote: > > Signed-off-by: zhanghailiang > > Acked-by: Riku Voipio > > Applied to linux-user as Michael seemed wary of passing these via > trivial. > > Riku Pls remember to add Cc qemu-trivial on bugfixes in your tree. > >--- > > linux-user/syscall.c | 4 ++++ > > 1 file changed, 4 insertions(+) > > > > diff --git a/linux-user/syscall.c b/linux-user/syscall.c > > index a50229d..8e5ccf1 100644 > > --- a/linux-user/syscall.c > > +++ b/linux-user/syscall.c > > @@ -2870,6 +2870,10 @@ static inline abi_long do_msgsnd(int msqid, abi_long msgp, > > if (!lock_user_struct(VERIFY_READ, target_mb, msgp, 0)) > > return -TARGET_EFAULT; > > host_mb = malloc(msgsz+sizeof(long)); > > + if (!host_mb) { > > + unlock_user_struct(target_mb, msgp, 0); > > + return -TARGET_ENOMEM; > > + } > > host_mb->mtype = (abi_long) tswapal(target_mb->mtype); > > memcpy(host_mb->mtext, target_mb->mtext, msgsz); > > ret = get_errno(msgsnd(msqid, host_mb, msgsz, msgflg)); > > -- > > 1.7.12.4 > > > >