[src/trunk]: src/sys/kern sel_setevents: fix direct injecting of fd bit for s...

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

details:   https://anonhg.NetBSD.org/src/rev/609af91f055b
branches:  trunk
changeset: 756283:609af91f055b
user:      rmind <rmind%NetBSD.org@localhost>
date:      Sat Jul 10 17:04:25 2010 +0000

description:
sel_setevents: fix direct injecting of fd bit for select() case.

diffstat:

 sys/kern/sys_select.c |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (35 lines):

diff -r e5eccd187345 -r 609af91f055b sys/kern/sys_select.c
--- a/sys/kern/sys_select.c     Sat Jul 10 16:43:40 2010 +0000
+++ b/sys/kern/sys_select.c     Sat Jul 10 17:04:25 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sys_select.c,v 1.24 2010/07/08 23:15:23 rmind Exp $    */
+/*     $NetBSD: sys_select.c,v 1.25 2010/07/10 17:04:25 rmind Exp $    */
 
 /*-
  * Copyright (c) 2007, 2008, 2009, 2010 The NetBSD Foundation, Inc.
@@ -84,7 +84,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_select.c,v 1.24 2010/07/08 23:15:23 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_select.c,v 1.25 2010/07/10 17:04:25 rmind Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -633,13 +633,14 @@
         */
        if (l->l_selbits != NULL) {
                fd_mask *fds = (fd_mask *)l->l_selbits;
-               const int ni = l->l_selni;
+               const size_t ni = l->l_selni;
                const int fd = sip->sel_fdinfo;
+               const int idx = fd >> __NFDSHIFT;
                int n;
 
                for (n = 0; n < 3; n++) {
                        if (sel_flag[n] | events) {
-                               fds[fd >> __NFDSHIFT] |= (fd & __NFDMASK);
+                               fds[idx] |= 1 << (fd & __NFDMASK);
                        }
                        fds = (fd_mask *)((char *)fds + ni);
                }