Date: Mon, 11 Jun 2012 20:17:20 +0000 (UTC) From: Pawel Jakub Dawidek <pjd@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r236917 - head/sys/kern Message-ID: <201206112017.q5BKHKsW007722@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pjd Date: Mon Jun 11 20:17:20 2012 New Revision: 236917 URL: http://svn.freebsd.org/changeset/base/236917 Log: Use consistent way of checking if descriptor number is valid. MFC after: 1 month Modified: head/sys/kern/kern_descrip.c Modified: head/sys/kern/kern_descrip.c ============================================================================== --- head/sys/kern/kern_descrip.c Mon Jun 11 20:12:13 2012 (r236916) +++ head/sys/kern/kern_descrip.c Mon Jun 11 20:17:20 2012 (r236917) @@ -245,7 +245,7 @@ fd_last_used(struct filedesc *fdp, int l static int fdisused(struct filedesc *fdp, int fd) { - KASSERT(fd >= 0 && fd < fdp->fd_nfiles, + KASSERT((unsigned int)fd < fdp->fd_nfiles, ("file descriptor %d out of range (0, %d)", fd, fdp->fd_nfiles)); return ((fdp->fd_map[NDSLOT(fd)] & NDBIT(fd)) != 0); } @@ -2212,7 +2212,7 @@ fget_unlocked(struct filedesc *fdp, int struct file *fp; u_int count; - if (fd < 0 || fd >= fdp->fd_nfiles) + if ((unsigned int)fd >= fdp->fd_nfiles) return (NULL); /* * Fetch the descriptor locklessly. We avoid fdrop() races by @@ -2598,7 +2598,7 @@ dupfdopen(struct thread *td, struct file * closed, then reject. */ FILEDESC_XLOCK(fdp); - if (dfd < 0 || dfd >= fdp->fd_nfiles || + if ((unsigned int)dfd >= fdp->fd_nfiles || (wfp = fdp->fd_ofiles[dfd]) == NULL) { FILEDESC_XUNLOCK(fdp); return (EBADF);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206112017.q5BKHKsW007722>