From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([140.186.70.92]:44361)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <edgar.iglesias@gmail.com>) id 1QAOa5-00032k-F5
	for qemu-devel@nongnu.org; Thu, 14 Apr 2011 11:35:42 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <edgar.iglesias@gmail.com>) id 1QAOa4-0002iv-2P
	for qemu-devel@nongnu.org; Thu, 14 Apr 2011 11:35:41 -0400
Date: Thu, 14 Apr 2011 17:35:34 +0200
From: "Edgar E. Iglesias" <edgar.iglesias@gmail.com>
Message-ID: <20110414153534.GA24879@laped.lan>
References: <1302786716-20933-1-git-send-email-peter.maydell@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1302786716-20933-1-git-send-email-peter.maydell@linaro.org>
Subject: Re: [Qemu-devel] [PATCH] tests/test-mmap.c: Check mmap() return
 value before using it
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <http://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: qemu-trivial@nongnu.org, qemu-devel@nongnu.org, patches@linaro.org

On Thu, Apr 14, 2011 at 02:11:56PM +0100, Peter Maydell wrote:
> Correct the position of a "stop if MAP_FAILED" check in the mmap()
> tests, so that if mmap() does fail we print a failure message
> rather than segfaulting inside memcpy().
> 
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

I've applied this, thanks.


> ---
>  tests/test-mmap.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/tests/test-mmap.c b/tests/test-mmap.c
> index fcb365f..c578e25 100644
> --- a/tests/test-mmap.c
> +++ b/tests/test-mmap.c
> @@ -164,6 +164,7 @@ void check_aligned_anonymous_unfixed_colliding_mmaps(void)
>  		nlen = pagesize * 8;
>  		p3 = mmap(NULL, nlen, PROT_READ, 
>  			  MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
> +		fail_unless (p3 != MAP_FAILED);
>  
>  		/* Check if the mmaped areas collide.  */
>  		if (p3 < p2 
> @@ -174,7 +175,6 @@ void check_aligned_anonymous_unfixed_colliding_mmaps(void)
>  
>  		/* Make sure we get pages aligned with the pagesize. The
>  		   target expects this.  */
> -		fail_unless (p3 != MAP_FAILED);
>  		p = (uintptr_t) p3;
>  		fail_unless ((p & pagemask) == 0);
>  		munmap (p2, pagesize);
> -- 
> 1.7.1
> 
>