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

Drop filedesc lock and acquire Giant around calls to malloc() and free().

Browse Source 
These call uma_large_malloc() and uma_large_free() which require Giant.
Fixes panic when descriptor table is larger than KMEM_ZMAX bytes
noticed by kkenn.

Reviewed by:	jhb
This commit is contained in:
tjr 2002-12-13 09:59:40 +00:00
parent e8395e7a1c
commit fbec56fe6d
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sys/kern/kern_descrip.c
View File

@ -1056,7 +1056,13 @@ fdalloc(td, want, result)
while (nfiles < want)
nfiles <<= 1;
FILEDESC_UNLOCK(fdp);
/*
* XXX malloc() calls uma_large_malloc() for sizes larger
* than KMEM_ZMAX bytes. uma_large_malloc() requires Giant.
*/
mtx_lock(&Giant);
newofile = malloc(nfiles * OFILESIZE, M_FILEDESC, M_WAITOK);
mtx_unlock(&Giant);
/*
* Deal with file-table extend race that might have
@ -1064,7 +1070,12 @@ fdalloc(td, want, result)
*/
FILEDESC_LOCK(fdp);
if (fdp->fd_nfiles >= nfiles) {
/* XXX uma_large_free() needs Giant. */
FILEDESC_UNLOCK(fdp);
mtx_lock(&Giant);
free(newofile, M_FILEDESC);
mtx_unlock(&Giant);
FILEDESC_LOCK(fdp);
continue;
}
newofileflags = (char *) &newofile[nfiles];
@ -1087,8 +1098,14 @@ fdalloc(td, want, result)
fdp->fd_ofileflags = newofileflags;
fdp->fd_nfiles = nfiles;
fdexpand++;
if (oldofile != NULL)
if (oldofile != NULL) {
/* XXX uma_large_free() needs Giant. */
FILEDESC_UNLOCK(fdp);
mtx_lock(&Giant);
free(oldofile, M_FILEDESC);
mtx_unlock(&Giant);
FILEDESC_LOCK(fdp);
}
}
return (0);
}