Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 4 Jun 2014 15:18:46 +0000 (UTC)
From:      Konstantin Belousov <kib@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject:   svn commit: r267059 - stable/10/sys/vm
Message-ID:  <201406041518.s54FIkpB054752@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: kib
Date: Wed Jun  4 15:18:46 2014
New Revision: 267059
URL: http://svnweb.freebsd.org/changeset/base/267059

Log:
  MFC r266780:
  Remove the assert which can be triggered by the userspace.

Modified:
  stable/10/sys/vm/vm_map.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/vm/vm_map.c
==============================================================================
--- stable/10/sys/vm/vm_map.c	Wed Jun  4 15:05:24 2014	(r267058)
+++ stable/10/sys/vm/vm_map.c	Wed Jun  4 15:18:46 2014	(r267059)
@@ -1986,11 +1986,8 @@ vm_map_protect(vm_map_t map, vm_offset_t
 		 */
 		if ((current->eflags & MAP_ENTRY_USER_WIRED) != 0 &&
 		    (current->protection & VM_PROT_WRITE) != 0 &&
-		    (old_prot & VM_PROT_WRITE) == 0) {
-			KASSERT(old_prot != VM_PROT_NONE,
-			    ("vm_map_protect: inaccessible wired map entry"));
+		    (old_prot & VM_PROT_WRITE) == 0)
 			vm_fault_copy_entry(map, map, current, current, NULL);
-		}
 
 		/*
 		 * When restricting access, update the physical map.  Worry



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406041518.s54FIkpB054752>