Module Name: src Committed By: sborrill Date: Sat Nov 19 22:22:56 UTC 2011
Modified Files: src/sys/kern [netbsd-5-1]: kern_event.c Log Message: Pull up the following revisions(s) (requested by rmind in ticket #1695): sys/kern/kern_event.c: revision 1.74 kqueue_register: avoid calling fd_getfile() with filedesc_t::fd_lock held. Fixes PR/45479 by KOGULE Ryo. To generate a diff of this commit: cvs rdiff -u -r1.60.6.2 -r1.60.6.2.2.1 src/sys/kern/kern_event.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/kern/kern_event.c diff -u src/sys/kern/kern_event.c:1.60.6.2 src/sys/kern/kern_event.c:1.60.6.2.2.1 --- src/sys/kern/kern_event.c:1.60.6.2 Sat Jan 9 01:08:39 2010 +++ src/sys/kern/kern_event.c Sat Nov 19 22:22:56 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_event.c,v 1.60.6.2 2010/01/09 01:08:39 snj Exp $ */ +/* $NetBSD: kern_event.c,v 1.60.6.2.2.1 2011/11/19 22:22:56 sborrill Exp $ */ /*- * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc. @@ -58,7 +58,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: kern_event.c,v 1.60.6.2 2010/01/09 01:08:39 snj Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_event.c,v 1.60.6.2.2.1 2011/11/19 22:22:56 sborrill Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -866,18 +866,16 @@ kqueue_register(struct kqueue *kq, struc return (EINVAL); } - mutex_enter(&fdp->fd_lock); - /* search if knote already exists */ if (kfilter->filtops->f_isfd) { /* monitoring a file descriptor */ fd = kev->ident; if ((fp = fd_getfile(fd)) == NULL) { - mutex_exit(&fdp->fd_lock); rw_exit(&kqueue_filter_lock); kmem_free(newkn, sizeof(*newkn)); return EBADF; } + mutex_enter(&fdp->fd_lock); ff = fdp->fd_ofiles[fd]; if (fd <= fdp->fd_lastkqfile) { SLIST_FOREACH(kn, &ff->ff_knlist, kn_link) { @@ -891,6 +889,7 @@ kqueue_register(struct kqueue *kq, struc * not monitoring a file descriptor, so * lookup knotes in internal hash table */ + mutex_enter(&fdp->fd_lock); if (fdp->fd_knhashmask != 0) { list = &fdp->fd_knhash[ KN_HASH((u_long)kev->ident, fdp->fd_knhashmask)];