svn commit: r300959 - head/sys/vm

Konstantin Belousov kib at FreeBSD.org
Sun May 29 15:46:21 UTC 2016


Author: kib
Date: Sun May 29 15:46:19 2016
New Revision: 300959
URL: https://svnweb.freebsd.org/changeset/base/300959

Log:
  Do not leak the vm object lock when swap reservation failed, in
  vm_object_coalesce().
  
  Reported and tested by:	pho
  Sponsored by:	The FreeBSD Foundation
  MFC after:	1 week

Modified:
  head/sys/vm/vm_object.c

Modified: head/sys/vm/vm_object.c
==============================================================================
--- head/sys/vm/vm_object.c	Sun May 29 15:02:55 2016	(r300958)
+++ head/sys/vm/vm_object.c	Sun May 29 15:46:19 2016	(r300959)
@@ -2123,6 +2123,7 @@ vm_object_coalesce(vm_object_t prev_obje
 		 */
 		if (!reserved && !swap_reserve_by_cred(ptoa(next_size),
 		    prev_object->cred)) {
+			VM_OBJECT_WUNLOCK(prev_object);
 			return (FALSE);
 		}
 		prev_object->charge += ptoa(next_size);


More information about the svn-src-all mailing list