svn commit: r295785 - head/sys/kern

[Mark Johnston]

Author: markj
Date: Fri Feb 19 01:35:01 2016
New Revision: 295785
URL: https://svnweb.freebsd.org/changeset/base/295785

Log:
  Return an error if both EV_ENABLE and EV_DISABLE are specified for a kevent.
  
  Currently, this combination results in EV_DISABLE being ignored.
  
  Reviewed by:	kib
  Sponsored by:	EMC / Isilon Storage Division
  Differential Revision:	https://reviews.freebsd.org/D5307

Modified:
  head/sys/kern/kern_event.c

Modified: head/sys/kern/kern_event.c
==============================================================================
--- head/sys/kern/kern_event.c	Fri Feb 19 01:08:03 2016	(r295784)
+++ head/sys/kern/kern_event.c	Fri Feb 19 01:35:01 2016	(r295785)
@@ -1116,6 +1116,9 @@ kqueue_register(struct kqueue *kq, struc
 	int error, filt, event;
 	int haskqglobal, filedesc_unlock;
 
+	if ((kev->flags & (EV_ENABLE | EV_DISABLE)) == (EV_ENABLE | EV_DISABLE))
+		return (EINVAL);
+
 	fp = NULL;
 	kn = NULL;
 	error = 0;