From owner-svn-src-user@FreeBSD.ORG  Sat Mar  2 17:08:15 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 5B567B09;
 Sat,  2 Mar 2013 17:08:15 +0000 (UTC)
 (envelope-from dchagin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 4E70F831;
 Sat,  2 Mar 2013 17:08:15 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r22H8FvI068053;
 Sat, 2 Mar 2013 17:08:15 GMT (envelope-from dchagin@svn.freebsd.org)
Received: (from dchagin@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r22H8E9S068049;
 Sat, 2 Mar 2013 17:08:14 GMT (envelope-from dchagin@svn.freebsd.org)
Message-Id: <201303021708.r22H8E9S068049@svn.freebsd.org>
From: Dmitry Chagin <dchagin@FreeBSD.org>
Date: Sat, 2 Mar 2013 17:08:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r247643 - in user/dchagin/lemul/sys: amd64/linux32
 i386/linux
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 02 Mar 2013 17:08:15 -0000

Author: dchagin
Date: Sat Mar  2 17:08:14 2013
New Revision: 247643
URL: http://svnweb.freebsd.org/changeset/base/247643

Log:
  Linux do not allow an mmap() offset which is not modulo the pagesize.

Modified:
  user/dchagin/lemul/sys/amd64/linux32/linux32_machdep.c
  user/dchagin/lemul/sys/i386/linux/linux_machdep.c

Modified: user/dchagin/lemul/sys/amd64/linux32/linux32_machdep.c
==============================================================================
--- user/dchagin/lemul/sys/amd64/linux32/linux32_machdep.c	Sat Mar  2 17:06:39 2013	(r247642)
+++ user/dchagin/lemul/sys/amd64/linux32/linux32_machdep.c	Sat Mar  2 17:08:14 2013	(r247643)
@@ -522,6 +522,13 @@ linux_mmap_common(struct thread *td, l_u
 	fp = NULL;
 
 	/*
+	 * Linux do not allow an offset which is not
+	 * modulo the pagesize.
+	 */
+	if (pos & PAGE_MASK)
+		return (EINVAL);
+
+	/*
 	 * Linux mmap(2):
 	 * You must specify exactly one of MAP_SHARED and MAP_PRIVATE
 	 */

Modified: user/dchagin/lemul/sys/i386/linux/linux_machdep.c
==============================================================================
--- user/dchagin/lemul/sys/i386/linux/linux_machdep.c	Sat Mar  2 17:06:39 2013	(r247642)
+++ user/dchagin/lemul/sys/i386/linux/linux_machdep.c	Sat Mar  2 17:08:14 2013	(r247643)
@@ -426,6 +426,13 @@ linux_mmap_common(struct thread *td, l_u
 	fp = NULL;
 
 	/*
+	 * Linux do not allow an offset which is not
+	 * modulo the pagesize.
+	 */
+	if (pos & PAGE_MASK)
+		return (EINVAL);
+
+	/*
 	 * Linux mmap(2):
 	 * You must specify exactly one of MAP_SHARED and MAP_PRIVATE
 	 */