From owner-svn-src-stable@FreeBSD.ORG  Wed Apr 14 15:33:31 2010
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 35FD41065670;
	Wed, 14 Apr 2010 15:33:31 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 24DA48FC17;
	Wed, 14 Apr 2010 15:33:31 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o3EFXVge012459;
	Wed, 14 Apr 2010 15:33:31 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3EFXVHv012457;
	Wed, 14 Apr 2010 15:33:31 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201004141533.o3EFXVHv012457@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Wed, 14 Apr 2010 15:33:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r206606 - stable/7/sys/kern
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Apr 2010 15:33:31 -0000

Author: jhb
Date: Wed Apr 14 15:33:30 2010
New Revision: 206606
URL: http://svn.freebsd.org/changeset/base/206606

Log:
  MFC 205886:
  Defer freeing a kevent list until after dropping kqueue locks.

Modified:
  stable/7/sys/kern/kern_event.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/kern/kern_event.c
==============================================================================
--- stable/7/sys/kern/kern_event.c	Wed Apr 14 15:33:15 2010	(r206605)
+++ stable/7/sys/kern/kern_event.c	Wed Apr 14 15:33:30 2010	(r206606)
@@ -1110,7 +1110,7 @@ static int
 kqueue_expand(struct kqueue *kq, struct filterops *fops, uintptr_t ident,
 	int waitok)
 {
-	struct klist *list, *tmp_knhash;
+	struct klist *list, *tmp_knhash, *to_free;
 	u_long tmp_knhashmask;
 	int size;
 	int fd;
@@ -1118,6 +1118,7 @@ kqueue_expand(struct kqueue *kq, struct 
 
 	KQ_NOTOWNED(kq);
 
+	to_free = NULL;
 	if (fops->f_isfd) {
 		fd = ident;
 		if (kq->kq_knlistsize <= fd) {
@@ -1130,13 +1131,13 @@ kqueue_expand(struct kqueue *kq, struct 
 				return ENOMEM;
 			KQ_LOCK(kq);
 			if (kq->kq_knlistsize > fd) {
-				FREE(list, M_KQUEUE);
+				to_free = list;
 				list = NULL;
 			} else {
 				if (kq->kq_knlist != NULL) {
 					bcopy(kq->kq_knlist, list,
 					    kq->kq_knlistsize * sizeof list);
-					FREE(kq->kq_knlist, M_KQUEUE);
+					to_free = kq->kq_knlist;
 					kq->kq_knlist = NULL;
 				}
 				bzero((caddr_t)list +
@@ -1158,11 +1159,12 @@ kqueue_expand(struct kqueue *kq, struct 
 				kq->kq_knhash = tmp_knhash;
 				kq->kq_knhashmask = tmp_knhashmask;
 			} else {
-				free(tmp_knhash, M_KQUEUE);
+				to_free = tmp_knhash;
 			}
 			KQ_UNLOCK(kq);
 		}
 	}
+	free(to_free, M_KQUEUE);
 
 	KQ_NOTOWNED(kq);
 	return 0;