From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O8z8L-0007dR-LK for qemu-devel@nongnu.org; Mon, 03 May 2010 13:08:41 -0400 Received: from [140.186.70.92] (port=59049 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O8z8K-0007d3-HA for qemu-devel@nongnu.org; Mon, 03 May 2010 13:08:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O8z8J-0000FO-GQ for qemu-devel@nongnu.org; Mon, 03 May 2010 13:08:40 -0400 Received: from mail-qy0-f188.google.com ([209.85.221.188]:45614) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O8z8J-0000FH-Dv for qemu-devel@nongnu.org; Mon, 03 May 2010 13:08:39 -0400 Received: by qyk26 with SMTP id 26so4138413qyk.19 for ; Mon, 03 May 2010 10:08:39 -0700 (PDT) Sender: Richard Henderson From: Richard Henderson Date: Mon, 3 May 2010 10:07:49 -0700 Message-Id: <1272906475-14480-2-git-send-email-rth@twiddle.net> In-Reply-To: <1272906475-14480-1-git-send-email-rth@twiddle.net> References: <1272906475-14480-1-git-send-email-rth@twiddle.net> Subject: [Qemu-devel] [PATCH 1/7] alpha-linux-user: Fix brk error return. List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Richard Henderson --- linux-user/syscall.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 17599eb..81e09b3 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -718,9 +718,17 @@ abi_long do_brk(abi_ulong new_brk) PROT_READ|PROT_WRITE, MAP_ANON|MAP_FIXED|MAP_PRIVATE, 0, 0)); - if (!is_error(mapped_addr)) +#if defined(TARGET_ALPHA) + /* We (partially) emulate OSF/1 on Alpha, which requires we + return a proper errno, not an unchanged brk value. */ + if (is_error(mapped_addr)) { + return -TARGET_ENOMEM; + } +#endif + + if (!is_error(mapped_addr)) { target_brk = new_brk; - + } return target_brk; } -- 1.6.6.1