- Assert that the proc to return is not NULL in runq_choose the

  same as runq_remove.
- bzero the whole struct runq in runq_init just in case its not
  statically allocated.

1 files changed, 2 insertions, 0 deletions

diff --git a/sys/kern/kern_switch.c b/sys/kern/kern_switch.c
index 8374048b1d07..bfe0e7f0f9dd 100644
--- a/sys/kern/kern_switch.c
+++ b/sys/kern/kern_switch.c
@@ -189,6 +189,7 @@ runq_choose(struct runq *rq)
 	if ((pri = runq_findbit(rq)) != -1) {
 		rqh = &rq->rq_queues[pri];
 		p = TAILQ_FIRST(rqh);
+		KASSERT(p != NULL, ("runq_choose: no proc on busy queue"));
 		CTR3(KTR_RUNQ, "runq_choose: pri=%d p=%p rqh=%p", pri, p, rqh);
 		TAILQ_REMOVE(rqh, p, p_procq);
 		if (TAILQ_EMPTY(rqh)) {
@@ -210,6 +211,7 @@ runq_init(struct runq *rq)
 {
 	int i;
 
+	bzero(rq, sizeof *rq);
 	for (i = 0; i < RQ_NQS; i++)
 		TAILQ_INIT(&rq->rq_queues[i]);
 }