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

Fix bug where malloc(.., M_NOWAIT) return value is not checked, Change to

Browse Source 
M_WAITOK and move outside the mutex

Submitted by:	shurd
Reviewed by:	mmacy@nextbsd.org
MFC after:	2 weeks
Differential Revision:	https://reviews.freebsd.org/D7649
This commit is contained in:
Sean Bruno 2016-10-11 14:08:53 +00:00
parent 0140799acb
commit 1ee17b070d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/kern/subr_gtaskqueue.c
View File

@ -728,7 +728,7 @@ taskqgroup_bind(struct taskqgroup *qgroup)
* one.
*/
for (i = 0; i < qgroup->tqg_cnt; i++) {
gtask = malloc(sizeof (*gtask), M_DEVBUF, M_NOWAIT);
gtask = malloc(sizeof (*gtask), M_DEVBUF, M_WAITOK);
GTASK_INIT(&gtask->bt_task, 0, 0, taskqgroup_binder, gtask);
gtask->bt_cpuid = qgroup->tqg_queue[i].tgc_cpu;
grouptaskqueue_enqueue(qgroup->tqg_queue[i].tgc_taskq,
@ -827,11 +827,11 @@ _taskqgroup_adjust(struct taskqgroup *qgroup, int cnt, int stride)
for (i = cnt; i < old_cnt; i++)
taskqgroup_cpu_remove(qgroup, i);
taskqgroup_bind(qgroup);
mtx_lock(&qgroup->tqg_lock);
qgroup->tqg_adjusting = 0;
taskqgroup_bind(qgroup);
return (0);
}