xnu-3248.20.55.tar.gz

[apple/xnu.git] / osfmk / kern / waitq.c

diff --git a/osfmk/kern/waitq.c b/osfmk/kern/waitq.c
index be41d6143dc6829448bba425ac9cd42f62115ed8..fad26e5ba50443d1d8ce2088a30551582e6569e9 100644 (file)
--- a/osfmk/kern/waitq.c
+++ b/osfmk/kern/waitq.c
@@ -584,9 +584,9 @@ struct wqt_elem *wq_table_alloc_elem(struct wq_table *table, int type, int nelem
                      type, table);
 
        assert(nelem > 0);
-       elem = NULL;
 
 try_again:
+       elem = NULL;
        if (ntries++ > max_retries) {
                struct wqt_elem *tmp;
                if (table->used_elem + nelem >= table_size)
@@ -4568,7 +4568,7 @@ static inline int waitq_maybe_remove_link(struct waitq *waitq,
                         * WQS we're unlinking, or to an invalid object:
                         * no need to invalidate it
                         */
-                       *wq_setid = right->sl_set_id.id;
+                       *wq_setid = right ? right->sl_set_id.id : 0;
                        lt_invalidate(parent);
                        wqdbg_v("S1, L");
                        return left ? WQ_ITERATE_UNLINKED : WQ_ITERATE_INVALID;
@@ -4578,7 +4578,7 @@ static inline int waitq_maybe_remove_link(struct waitq *waitq,
                         * WQS we're unlinking, or to an invalid object:
                         * no need to invalidate it
                         */
-                       *wq_setid = left->sl_set_id.id;
+                       *wq_setid = left ? left->sl_set_id.id : 0;
                        lt_invalidate(parent);
                        wqdbg_v("S1, R");
                        return right ? WQ_ITERATE_UNLINKED : WQ_ITERATE_INVALID;