From patchwork Sat Jan 2 03:45:33 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirill A. Shutemov" X-Patchwork-Id: 42005 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 5D1DCB6EEE for ; Sat, 2 Jan 2010 15:09:44 +1100 (EST) Received: from localhost ([127.0.0.1]:59192 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NQvJ7-0007oq-9f for incoming@patchwork.ozlabs.org; Fri, 01 Jan 2010 23:09:41 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NQuwI-0006f3-20 for qemu-devel@nongnu.org; Fri, 01 Jan 2010 22:46:06 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NQuwC-0006cZ-Vz for qemu-devel@nongnu.org; Fri, 01 Jan 2010 22:46:05 -0500 Received: from [199.232.76.173] (port=53820 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NQuwC-0006cT-Ld for qemu-devel@nongnu.org; Fri, 01 Jan 2010 22:46:00 -0500 Received: from mail-fx0-f222.google.com ([209.85.220.222]:55673) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NQuwC-00082i-EJ for qemu-devel@nongnu.org; Fri, 01 Jan 2010 22:46:00 -0500 Received: by mail-fx0-f222.google.com with SMTP id 22so16659813fxm.2 for ; Fri, 01 Jan 2010 19:46:00 -0800 (PST) Received: by 10.223.3.197 with SMTP id 5mr2532364fao.75.1262403959928; Fri, 01 Jan 2010 19:45:59 -0800 (PST) Received: from localhost.localdomain (a88-114-220-92.elisa-laajakaista.fi [88.114.220.92]) by mx.google.com with ESMTPS id 35sm22820386fkt.40.2010.01.01.19.45.58 (version=SSLv3 cipher=RC4-MD5); Fri, 01 Jan 2010 19:45:59 -0800 (PST) From: "Kirill A. Shutemov" To: qemu-devel@nongnu.org Date: Sat, 2 Jan 2010 05:45:33 +0200 Message-Id: <1262403933-26881-15-git-send-email-kirill@shutemov.name> X-Mailer: git-send-email 1.6.5.7 In-Reply-To: <1262403933-26881-14-git-send-email-kirill@shutemov.name> References: <1262403933-26881-1-git-send-email-kirill@shutemov.name> <1262403933-26881-2-git-send-email-kirill@shutemov.name> <1262403933-26881-3-git-send-email-kirill@shutemov.name> <1262403933-26881-4-git-send-email-kirill@shutemov.name> <1262403933-26881-5-git-send-email-kirill@shutemov.name> <1262403933-26881-6-git-send-email-kirill@shutemov.name> <1262403933-26881-7-git-send-email-kirill@shutemov.name> <1262403933-26881-8-git-send-email-kirill@shutemov.name> <1262403933-26881-9-git-send-email-kirill@shutemov.name> <1262403933-26881-10-git-send-email-kirill@shutemov.name> <1262403933-26881-11-git-send-email-kirill@shutemov.name> <1262403933-26881-12-git-send-email-kirill@shutemov.name> <1262403933-26881-13-git-send-email-kirill@shutemov.name> <1262403933-26881-14-git-send-email-kirill@shutemov.name> X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Cc: "Kirill A. Shutemov" Subject: [Qemu-devel] [PATCH 15/15] linux-user: fix return value of mmap_frag() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org mmap_frag() returns -1 on error and set errno. Signed-off-by: Kirill A. Shutemov --- linux-user/mmap.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/linux-user/mmap.c b/linux-user/mmap.c index c1c7e48..47bc339 100644 --- a/linux-user/mmap.c +++ b/linux-user/mmap.c @@ -242,8 +242,10 @@ static int mmap_frag(abi_ulong real_start, /* msync() won't work here, so we return an error if write is possible while it is a shared mapping */ if ((flags & MAP_TYPE) == MAP_SHARED && - (prot & PROT_WRITE)) - return -EINVAL; + (prot & PROT_WRITE)) { + errno = -EINVAL; + return -1; + } /* adjust protection to be able to read */ if (!(prot1 & PROT_WRITE))