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

r326394 is calling malloc with M_WAITOK under a lock, revert for now

Browse Source 
Reported by:	andrew
This commit is contained in:
Emmanuel Vadot 2017-11-30 14:06:54 +00:00
parent 31e8b07376
commit 38c9c65ee4
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/fs/devfs/devfs_dir.c
View File

@ -98,18 +98,19 @@ devfs_dir_ref(const char *dir)
if (*dir == '\0') if (*dir == '\0')
return; return;
dle_new = malloc(sizeof(*dle), M_DEVFS4, M_WAITOK);
dle_new->dir = strdup(dir, M_DEVFS4);
dle_new->refcnt = 1;
mtx_lock(&dirlist_mtx); mtx_lock(&dirlist_mtx);
dle = devfs_dir_findent_locked(dir); dle = devfs_dir_findent_locked(dir);
if (dle != NULL) { if (dle != NULL) {
dle->refcnt++; dle->refcnt++;
mtx_unlock(&dirlist_mtx); mtx_unlock(&dirlist_mtx);
free(dle_new->dir, M_DEVFS4);
free(dle_new, M_DEVFS4);
return; return;
} }
dle_new = malloc(sizeof(*dle), M_DEVFS4, M_WAITOK);
dle_new->dir = strdup(dir, M_DEVFS4);
dle_new->refcnt = 1;
LIST_INSERT_HEAD(&devfs_dirlist, dle_new, link); LIST_INSERT_HEAD(&devfs_dirlist, dle_new, link);
mtx_unlock(&dirlist_mtx); mtx_unlock(&dirlist_mtx);
} }