qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Kirill A. Shutemov" <kirill@shutemov.name>
To: qemu-devel@nongnu.org
Cc: "Kirill A. Shutemov" <kirill@shutemov.name>
Subject: [Qemu-devel] [PATCH 15/15] linux-user: fix return value of mmap_frag()
Date: Sat,  2 Jan 2010 05:45:33 +0200	[thread overview]
Message-ID: <1262403933-26881-15-git-send-email-kirill@shutemov.name> (raw)
In-Reply-To: <1262403933-26881-14-git-send-email-kirill@shutemov.name>

mmap_frag() returns -1 on error and set errno.

Signed-off-by: Kirill A. Shutemov <kirill@shutemov.name>
---
 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))
-- 
1.6.5.7

  reply	other threads:[~2010-01-02  3:46 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-01-02  3:45 [Qemu-devel] [PATCH 01/15] Introduce qemu_write_full() Kirill A. Shutemov
2010-01-02  3:45 ` [Qemu-devel] [PATCH 02/15] posix-aio-compat.c: fix warning with _FORTIFY_SOURCE Kirill A. Shutemov
2010-01-02  3:45   ` [Qemu-devel] [PATCH 03/15] block/cow.c: fix warnings " Kirill A. Shutemov
2010-01-02  3:45     ` [Qemu-devel] [PATCH 04/15] block/qcow.c: " Kirill A. Shutemov
2010-01-02  3:45       ` [Qemu-devel] [PATCH 05/15] block/vmdk.o: " Kirill A. Shutemov
2010-01-02  3:45         ` [Qemu-devel] [PATCH 06/15] block/vvfat.c: " Kirill A. Shutemov
2010-01-02  3:45           ` [Qemu-devel] [PATCH 07/15] block/qcow2.c: " Kirill A. Shutemov
2010-01-02  3:45             ` [Qemu-devel] [PATCH 08/15] net/slirp.c: fix warning " Kirill A. Shutemov
2010-01-02  3:45               ` [Qemu-devel] [PATCH 09/15] usb-linux.c: " Kirill A. Shutemov
2010-01-02  3:45                 ` [Qemu-devel] [PATCH 10/15] vl.c: " Kirill A. Shutemov
2010-01-02  3:45                   ` [Qemu-devel] [PATCH 11/15] monitor.c: fix warnings " Kirill A. Shutemov
2010-01-02  3:45                     ` [Qemu-devel] [PATCH 12/15] linux-user/mmap.c: " Kirill A. Shutemov
2010-01-02  3:45                       ` [Qemu-devel] [PATCH 13/15] Enable _FORTIFY_SOURCE=2 Kirill A. Shutemov
2010-01-02  3:45                         ` [Qemu-devel] [PATCH 14/15] Add -fstack-protector-all to CFLAGS Kirill A. Shutemov
2010-01-02  3:45                           ` Kirill A. Shutemov [this message]
     [not found]                 ` <m3zl4svci4.fsf@neno.neno>
2010-01-05 16:07                   ` [Qemu-devel] Re: [PATCH 09/15] usb-linux.c: fix warning with _FORTIFY_SOURCE Kirill A. Shutemov
2010-01-05 16:36                     ` Michael S. Tsirkin
2010-01-02 10:34 ` [Qemu-devel] Re: [PATCH 01/15] Introduce qemu_write_full() Paolo Bonzini

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1262403933-26881-15-git-send-email-kirill@shutemov.name \
    --to=kirill@shutemov.name \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).