Module Name: src
Committed By: christos
Date: Thu Jul 14 18:16:51 UTC 2016
Modified Files:
src/sys/kern: kern_event.c
Log Message:
make sure we cleanup properly when fd is too big.
To generate a diff of this commit:
cvs rdiff -u -r1.87 -r1.88 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.87 src/sys/kern/kern_event.c:1.88
--- src/sys/kern/kern_event.c:1.87 Thu Jul 14 02:22:17 2016
+++ src/sys/kern/kern_event.c Thu Jul 14 14:16:51 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_event.c,v 1.87 2016/07/14 06:22:17 christos Exp $ */
+/* $NetBSD: kern_event.c,v 1.88 2016/07/14 18:16:51 christos 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.87 2016/07/14 06:22:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_event.c,v 1.88 2016/07/14 18:16:51 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -936,10 +936,8 @@ kqueue_register(struct kqueue *kq, struc
if (kfilter->filtops->f_isfd) {
/* monitoring a file descriptor */
/* validate descriptor */
- if (kev->ident > INT_MAX)
- return EBADF;
- fd = kev->ident;
- if ((fp = fd_getfile(fd)) == NULL) {
+ if (kev->ident > INT_MAX
+ || (fp = fd_getfile(fd = kev->ident)) == NULL) {
rw_exit(&kqueue_filter_lock);
kmem_free(newkn, sizeof(*newkn));
return EBADF;
