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

Don't check for fd limits in fdgrowtable_exp.

Browse Source 
Callers do that already and additional check races with process
decreasing limits and can result in not growing the table at all, which
is currently not handled.

MFC after:	3 days
This commit is contained in:
Mateusz Guzik 2014-01-03 16:34:16 +00:00
parent d473bac729
commit 0918d4b21f
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/kern/kern_descrip.c
View File

@ -1481,18 +1481,13 @@ filecaps_validate(const struct filecaps *fcaps, const char *func)
static void
fdgrowtable_exp(struct filedesc *fdp, int nfd)
{
int nfd1, maxfd;
int nfd1;
FILEDESC_XLOCK_ASSERT(fdp);
nfd1 = fdp->fd_nfiles * 2;
if (nfd1 < nfd)
nfd1 = nfd;
maxfd = getmaxfd(curproc);
if (maxfd < nfd1)
nfd1 = maxfd;
KASSERT(nfd <= nfd1,
("too low nfd1 %d %d %d %d", nfd, fdp->fd_nfiles, maxfd, nfd1));
fdgrowtable(fdp, nfd1);
}