From owner-svn-src-all@FreeBSD.ORG Wed May 28 00:45:36 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4223DA43; Wed, 28 May 2014 00:45:36 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a: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 2F26227CD; Wed, 28 May 2014 00:45:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4S0jaNO025354; Wed, 28 May 2014 00:45:36 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4S0jafd025353; Wed, 28 May 2014 00:45:36 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201405280045.s4S0jafd025353@svn.freebsd.org> From: Konstantin Belousov Date: Wed, 28 May 2014 00:45:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r266780 - head/sys/vm X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 May 2014 00:45:36 -0000 Author: kib Date: Wed May 28 00:45:35 2014 New Revision: 266780 URL: http://svnweb.freebsd.org/changeset/base/266780 Log: Remove the assert which can be triggered by the userspace. The situation checked by assert is verified to not take place in vm_map_wire(), and protection permissions on the wired entry can be revoked afterward. Reported by: markj Reviewed by: alc Sponsored by: The FreeBSD Foundation MFC after: 1 week Modified: head/sys/vm/vm_map.c Modified: head/sys/vm/vm_map.c ============================================================================== --- head/sys/vm/vm_map.c Wed May 28 00:30:32 2014 (r266779) +++ head/sys/vm/vm_map.c Wed May 28 00:45:35 2014 (r266780) @@ -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