From owner-p4-projects@FreeBSD.ORG  Mon Sep  8 04:52:29 2014
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 4A13D5B2; Mon,  8 Sep 2014 04:52:29 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id CC14F3AA
 for <perforce@freebsd.org>; Mon,  8 Sep 2014 04:51:01 +0000 (UTC)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:1900:2254:2068::682:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A26BF1DDB
 for <perforce@freebsd.org>; Mon,  8 Sep 2014 04:51:01 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s884p1rZ026634
 for <perforce@freebsd.org>; Mon, 8 Sep 2014 04:51:01 GMT
 (envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s884p1Ja026631
 for perforce@freebsd.org; Mon, 8 Sep 2014 04:51:01 GMT
 (envelope-from jhb@freebsd.org)
Date: Mon, 8 Sep 2014 04:51:01 GMT
Message-Id: <201409080451.s884p1Ja026631@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
Subject: PERFORCE change 1199442 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects/>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 08 Sep 2014 04:52:29 -0000

http://p4web.freebsd.org/@@1199442?ac=10

Change 1199442 by jhb@jhb_jhbbsd on 2014/08/27 20:36:19

	More error checking for mmap().

Affected files ...

.. //depot/projects/smpng/sys/vm/vm_mmap.c#105 edit

Differences ...

==== //depot/projects/smpng/sys/vm/vm_mmap.c#105 (text+ko) ====

@@ -213,7 +213,7 @@
 
 	addr = (vm_offset_t) uap->addr;
 	size = uap->len;
-	prot = uap->prot & VM_PROT_ALL;
+	prot = uap->prot;
 	flags = uap->flags;
 	pos = uap->pos;
 
@@ -246,6 +246,14 @@
 	}
 	if ((flags & (MAP_EXCL | MAP_FIXED)) == MAP_EXCL)
 		return (EINVAL);
+	if ((prot & ~(PROT_READ | PROT_WRITE | PROT_EXEC | PROT_NONE)) != 0)
+		return (EINVAL);
+
+	/* Exactly one of MAP_SHARED or MAP_PRIVATE must be given. */
+	if ((flags & (MAP_SHARED | MAP_PRIVATE)) == 0 ||
+	    (flags & (MAP_SHARED | MAP_PRIVATE)) == (MAP_SHARED | MAP_PRIVATE))
+		return (EINVAL);
+
 
 	/*
 	 * Align the file position to a page boundary,