Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-10 06:01:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

ida: Fix crash in ida_free when the bitmap is empty

Browse Source 
The IDA usually detects double-frees, but that detection failed to
consider the case when there are no nearby IDs allocated and so we have a
NULL bitmap rather than simply having a clear bit.  Add some tests to the
test-suite to be sure we don't inadvertently reintroduce this problem.
Unfortunately they're quite noisy so include a message to disregard
the warnings.

Reported-by: Zhenghan Wang <wzhmmmmm@gmail.com>
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Matthew Wilcox (Oracle) 2023-12-21 16:53:57 +00:00 committed by Linus Torvalds
parent a9e01ac8c5
commit af73483f4e
2 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/idr.c
View File

@ -508,7 +508,7 @@ void ida_free(struct ida *ida, unsigned int id)
goto delete; goto delete;
xas_store(&xas, xa_mk_value(v)); xas_store(&xas, xa_mk_value(v));
} else { } else {
if (!test_bit(bit, bitmap->bitmap)) if (!bitmap || !test_bit(bit, bitmap->bitmap))
goto err; goto err;
__clear_bit(bit, bitmap->bitmap); __clear_bit(bit, bitmap->bitmap);
xas_set_mark(&xas, XA_FREE_MARK); xas_set_mark(&xas, XA_FREE_MARK);

40
lib/test_ida.c
View File

@ -150,6 +150,45 @@ static void ida_check_conv(struct ida *ida)
IDA_BUG_ON(ida, !ida_is_empty(ida)); IDA_BUG_ON(ida, !ida_is_empty(ida));
} }
/*
* Check various situations where we attempt to free an ID we don't own.
*/
static void ida_check_bad_free(struct ida *ida)
{
unsigned long i;
printk("vvv Ignore \"not allocated\" warnings\n");
/* IDA is empty; all of these will fail */
ida_free(ida, 0);
for (i = 0; i < 31; i++)
ida_free(ida, 1 << i);
/* IDA contains a single value entry */
IDA_BUG_ON(ida, ida_alloc_min(ida, 3, GFP_KERNEL) != 3);
ida_free(ida, 0);
for (i = 0; i < 31; i++)
ida_free(ida, 1 << i);
/* IDA contains a single bitmap */
IDA_BUG_ON(ida, ida_alloc_min(ida, 1023, GFP_KERNEL) != 1023);
ida_free(ida, 0);
for (i = 0; i < 31; i++)
ida_free(ida, 1 << i);
/* IDA contains a tree */
IDA_BUG_ON(ida, ida_alloc_min(ida, (1 << 20) - 1, GFP_KERNEL) != (1 << 20) - 1);
ida_free(ida, 0);
for (i = 0; i < 31; i++)
ida_free(ida, 1 << i);
printk("^^^ \"not allocated\" warnings over\n");
ida_free(ida, 3);
ida_free(ida, 1023);
ida_free(ida, (1 << 20) - 1);
IDA_BUG_ON(ida, !ida_is_empty(ida));
}
static DEFINE_IDA(ida); static DEFINE_IDA(ida);
static int ida_checks(void) static int ida_checks(void)
@ -162,6 +201,7 @@ static int ida_checks(void)
ida_check_leaf(&ida, 1024 * 64); ida_check_leaf(&ida, 1024 * 64);
ida_check_max(&ida); ida_check_max(&ida);
ida_check_conv(&ida); ida_check_conv(&ida);
ida_check_bad_free(&ida);
printk("IDA: %u of %u tests passed\n", tests_passed, tests_run); printk("IDA: %u of %u tests passed\n", tests_passed, tests_run);
return (tests_run != tests_passed) ? 0 : -EINVAL; return (tests_run != tests_passed) ? 0 : -EINVAL;