From patchwork Thu Mar 25 21:11:17 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juergen Lock X-Patchwork-Id: 48604 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 696F5B7CF5 for ; Fri, 26 Mar 2010 09:28:47 +1100 (EST) Received: from localhost ([127.0.0.1]:49163 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NuvRg-0005k9-TH for incoming@patchwork.ozlabs.org; Thu, 25 Mar 2010 18:22:32 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NuuoN-0006LD-4g for qemu-devel@nongnu.org; Thu, 25 Mar 2010 17:41:55 -0400 Received: from [140.186.70.92] (port=42710 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NuuoJ-0006Ii-Sd for qemu-devel@nongnu.org; Thu, 25 Mar 2010 17:41:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1NuuoG-0005xY-0e for qemu-devel@nongnu.org; Thu, 25 Mar 2010 17:41:51 -0400 Received: from gelbbaer.kn-bremen.de ([78.46.108.116]:41694 helo=smtp.kn-bremen.de) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NuuoF-0005wv-OP for qemu-devel@nongnu.org; Thu, 25 Mar 2010 17:41:47 -0400 Received: by smtp.kn-bremen.de (Postfix, from userid 10) id 4EE2C1E00175; Thu, 25 Mar 2010 22:41:46 +0100 (CET) Received: from triton8.kn-bremen.de (noident@localhost [127.0.0.1]) by triton8.kn-bremen.de (8.14.3/8.14.3) with ESMTP id o2PLBHiI052567 for ; Thu, 25 Mar 2010 22:11:17 +0100 (CET) (envelope-from nox@triton8.kn-bremen.de) Received: (from nox@localhost) by triton8.kn-bremen.de (8.14.3/8.14.3/Submit) id o2PLBHa9052566 for qemu-devel@nongnu.org; Thu, 25 Mar 2010 22:11:17 +0100 (CET) (envelope-from nox) From: Juergen Lock Date: Thu, 25 Mar 2010 22:11:17 +0100 To: qemu-devel@nongnu.org Message-ID: <20100325211117.GA52537@triton8.kn-bremen.de> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: [Qemu-devel] [PATCH] Fix bsd-user qemu_vmalloc() host page protection code 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 Just do the same as linux-user does. Signed-off-by: Juergen Lock --- a/bsd-user/mmap.c +++ b/bsd-user/mmap.c @@ -77,16 +77,15 @@ void mmap_unlock(void) void *qemu_vmalloc(size_t size) { void *p; - unsigned long addr; mmap_lock(); /* Use map and mark the pages as used. */ p = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1, 0); - addr = (unsigned long)p; - if (addr == (target_ulong) addr) { + if (h2g_valid(p)) { /* Allocated region overlaps guest address space. This may recurse. */ + abi_ulong addr = h2g(p); page_set_flags(addr & TARGET_PAGE_MASK, TARGET_PAGE_ALIGN(addr + size), PAGE_RESERVED); }