[src/trunk]: src/sys/kern Stopgap fix for PR kern/46463: disallow passing of ...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/bc1a4d199c00
branches:  trunk
changeset: 779543:bc1a4d199c00
user:      martin <martin%NetBSD.org@localhost>
date:      Sat Jun 02 16:16:16 2012 +0000

description:
Stopgap fix for PR kern/46463: disallow passing of kqueue descriptors
via SCM_RIGHT anxiliary socket messages.

diffstat:

 sys/kern/uipc_usrreq.c |  9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diffs (30 lines):

diff -r 3542560e1e34 -r bc1a4d199c00 sys/kern/uipc_usrreq.c
--- a/sys/kern/uipc_usrreq.c    Sat Jun 02 15:54:02 2012 +0000
+++ b/sys/kern/uipc_usrreq.c    Sat Jun 02 16:16:16 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uipc_usrreq.c,v 1.136 2011/06/26 16:42:43 christos Exp $       */
+/*     $NetBSD: uipc_usrreq.c,v 1.137 2012/06/02 16:16:16 martin Exp $ */
 
 /*-
  * Copyright (c) 1998, 2000, 2004, 2008, 2009 The NetBSD Foundation, Inc.
@@ -96,7 +96,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_usrreq.c,v 1.136 2011/06/26 16:42:43 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_usrreq.c,v 1.137 2012/06/02 16:16:16 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1382,7 +1382,10 @@
                        error = EAGAIN;
                        goto out;
                }
-               if ((fp = fd_getfile(fd)) == NULL) {
+               if ((fp = fd_getfile(fd)) == NULL
+                   || fp->f_type == DTYPE_KQUEUE) {
+                       if (fp)
+                               fd_putfile(fd);
                        atomic_dec_uint(&unp_rights);
                        nfds = i;
                        error = EBADF;