aboutsummaryrefslogtreecommitdiff
path: root/lib/idr.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2024-01-08 12:57:28 +0100
committerIngo Molnar <mingo@kernel.org>2024-01-08 12:57:28 +0100
commitcdb3033e191fd03da2d7da23b9cd448dfa180a8e (patch)
treee863d55e63bea2bc9c18652e0d7291fec5e5cd23 /lib/idr.c
parentfbb66ce0b1d670c72def736a13ac9176b860df4e (diff)
parentf60a631ab9ed5df15e446269ea515f2b8948ba0c (diff)
Merge branch 'sched/urgent' into sched/core, to pick up pending v6.7 fixes for the v6.8 merge window
This fix didn't make it upstream in time, pick it up for the v6.8 merge window. Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'lib/idr.c')
-rw-r--r--lib/idr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/idr.c b/lib/idr.c
index 13f2758c2377..da36054c3ca0 100644
--- a/lib/idr.c
+++ b/lib/idr.c
@@ -508,7 +508,7 @@ void ida_free(struct ida *ida, unsigned int id)
goto delete;
xas_store(&xas, xa_mk_value(v));
} else {
- if (!test_bit(bit, bitmap->bitmap))
+ if (!bitmap || !test_bit(bit, bitmap->bitmap))
goto err;
__clear_bit(bit, bitmap->bitmap);
xas_set_mark(&xas, XA_FREE_MARK);