d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fd: effectively revert r305091

Browse Source 
Turns out fd_lastfile can survive being -1 for some processes, giving
incorrect results with the cast.

Noted by: cem
This commit is contained in:
Mateusz Guzik 2016-08-31 12:29:04 +00:00
parent 9007a8679a
commit 44feca2360
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/sys/filedesc.h
View File

@ -201,7 +201,7 @@ fget_locked(struct filedesc *fdp, int fd)
FILEDESC_LOCK_ASSERT(fdp);
if ((u_int)fd > fdp->fd_lastfile)
if (fd < 0 || fd > fdp->fd_lastfile)
return (NULL);
return (fdp->fd_ofiles[fd].fde_file);
@ -213,7 +213,7 @@ fdeget_locked(struct filedesc *fdp, int fd)
FILEDESC_LOCK_ASSERT(fdp);
if ((u_int)fd > fdp->fd_lastfile)
if (fd < 0 || fd > fdp->fd_lastfile)
return (NULL);
return (&fdp->fd_ofiles[fd]);