From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>,
Zhenghan Wang <wzhmmmmm@gmail.com>,
Linus Torvalds <torvalds@linux-foundation.org>,
Sasha Levin <sashal@kernel.org>,
linux-fsdevel@vger.kernel.org
Subject: [PATCH AUTOSEL 6.6 39/39] ida: Fix crash in ida_free when the bitmap is empty
Date: Mon, 25 Dec 2023 19:19:29 -0500 [thread overview]
Message-ID: <20231226002021.4776-39-sashal@kernel.org> (raw)
In-Reply-To: <20231226002021.4776-1-sashal@kernel.org>
From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
[ Upstream commit af73483f4e8b6f5c68c9aa63257bdd929a9c194a ]
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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
lib/idr.c | 2 +-
lib/test_ida.c | 40 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 41 insertions(+), 1 deletion(-)
diff --git a/lib/idr.c b/lib/idr.c
index 13f2758c23773..da36054c3ca02 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);
diff --git a/lib/test_ida.c b/lib/test_ida.c
index b068806259615..55105baa19da9 100644
--- a/lib/test_ida.c
+++ b/lib/test_ida.c
@@ -150,6 +150,45 @@ static void ida_check_conv(struct ida *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 int ida_checks(void)
@@ -162,6 +201,7 @@ static int ida_checks(void)
ida_check_leaf(&ida, 1024 * 64);
ida_check_max(&ida);
ida_check_conv(&ida);
+ ida_check_bad_free(&ida);
printk("IDA: %u of %u tests passed\n", tests_passed, tests_run);
return (tests_run != tests_passed) ? 0 : -EINVAL;
--
2.43.0
prev parent reply other threads:[~2023-12-26 0:22 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-26 0:18 [PATCH AUTOSEL 6.6 01/39] Input: psmouse - enable Synaptics InterTouch for ThinkPad L14 G1 Sasha Levin
2023-12-26 0:18 ` [PATCH AUTOSEL 6.6 02/39] reset: hisilicon: hi6220: fix Wvoid-pointer-to-enum-cast warning Sasha Levin
2023-12-26 0:18 ` [PATCH AUTOSEL 6.6 03/39] Input: atkbd - skip ATKBD_CMD_GETID in translated mode Sasha Levin
2023-12-26 0:18 ` [PATCH AUTOSEL 6.6 04/39] Input: i8042 - add nomux quirk for Acer P459-G2-M Sasha Levin
2023-12-26 0:18 ` [PATCH AUTOSEL 6.6 05/39] Input: amimouse - convert to platform remove callback returning void Sasha Levin
2023-12-26 0:18 ` [PATCH AUTOSEL 6.6 06/39] pinctrl: amd: Mask non-wake source pins with interrupt enabled at suspend Sasha Levin
2023-12-26 0:18 ` [PATCH AUTOSEL 6.6 07/39] spi: cadence: revert "Add SPI transfer delays" Sasha Levin
2023-12-26 0:18 ` [PATCH AUTOSEL 6.6 08/39] ASoC: cs35l45: Use modern pm_ops Sasha Levin
2023-12-26 0:18 ` [PATCH AUTOSEL 6.6 09/39] ASoC: cs35l45: Prevent IRQ handling when suspending/resuming Sasha Levin
2023-12-26 0:19 ` [PATCH AUTOSEL 6.6 10/39] ASoC: cs35l45: Prevents spinning during runtime suspend Sasha Levin
2023-12-26 0:19 ` [PATCH AUTOSEL 6.6 11/39] s390/scm: fix virtual vs physical address confusion Sasha Levin
2023-12-26 0:19 ` [PATCH AUTOSEL 6.6 12/39] ARC: fix spare error Sasha Levin
2023-12-26 0:19 ` [PATCH AUTOSEL 6.6 13/39] ARC: fix smatch warning Sasha Levin
2023-12-26 0:19 ` [PATCH AUTOSEL 6.6 14/39] wifi: iwlwifi: pcie: avoid a NULL pointer dereference Sasha Levin
2023-12-26 0:19 ` [PATCH AUTOSEL 6.6 15/39] Input: xpad - add Razer Wolverine V2 support Sasha Levin
2023-12-26 0:19 ` [PATCH AUTOSEL 6.6 16/39] driver core: Add a guard() definition for the device_lock() Sasha Levin
2023-12-26 0:19 ` [PATCH AUTOSEL 6.6 17/39] kselftest: alsa: fixed a print formatting warning Sasha Levin
2023-12-26 0:19 ` [PATCH AUTOSEL 6.6 18/39] HID: nintendo: fix initializer element is not constant error Sasha Levin
2023-12-26 0:19 ` [PATCH AUTOSEL 6.6 19/39] platform/x86: thinkpad_acpi: fix for incorrect fan reporting on some ThinkPad systems Sasha Levin
2023-12-26 0:19 ` [PATCH AUTOSEL 6.6 20/39] platform/x86/amd/pmc: Move platform defines to header Sasha Levin
2023-12-26 0:19 ` [PATCH AUTOSEL 6.6 21/39] platform/x86/amd/pmc: Only run IRQ1 firmware version check on Cezanne Sasha Levin
2023-12-26 0:19 ` [PATCH AUTOSEL 6.6 22/39] platform/x86/amd/pmc: Move keyboard wakeup disablement detection to pmc-quirks Sasha Levin
2023-12-26 0:19 ` [PATCH AUTOSEL 6.6 23/39] platform/x86/amd/pmc: Disable keyboard wakeup on AMD Framework 13 Sasha Levin
2023-12-26 0:19 ` [PATCH AUTOSEL 6.6 24/39] ASoC: Intel: bytcr_rt5640: Add quirk for the Medion Lifetab S10346 Sasha Levin
2023-12-26 0:19 ` [PATCH AUTOSEL 6.6 25/39] ASoC: Intel: bytcr_rt5640: Add new swapped-speakers quirk Sasha Levin
2023-12-26 0:19 ` [PATCH AUTOSEL 6.6 26/39] ALSA: hda/realtek: Add quirks for ASUS Zenbook 2022 Models Sasha Levin
2023-12-26 0:19 ` [PATCH AUTOSEL 6.6 27/39] dm audit: fix Kconfig so DM_AUDIT depends on BLK_DEV_DM Sasha Levin
2023-12-26 0:19 ` [PATCH AUTOSEL 6.6 28/39] HID: nintendo: Prevent divide-by-zero on code Sasha Levin
2023-12-26 0:19 ` [PATCH AUTOSEL 6.6 29/39] smb: client: fix potential OOB in smb2_dump_detail() Sasha Levin
2023-12-26 0:19 ` [PATCH AUTOSEL 6.6 30/39] Revert "nvme-fc: fix race between error recovery and creating association" Sasha Levin
2023-12-26 0:19 ` [PATCH AUTOSEL 6.6 31/39] i2c: rk3x: fix potential spinlock recursion on poll Sasha Levin
2023-12-26 0:19 ` [PATCH AUTOSEL 6.6 32/39] drm/amdkfd: svm range always mapped flag not working on APU Sasha Levin
2023-12-26 0:19 ` [PATCH AUTOSEL 6.6 33/39] drm/amd/display: Add case for dcn35 to support usb4 dmub hpd event Sasha Levin
2023-12-26 0:19 ` [PATCH AUTOSEL 6.6 34/39] drm/amd/display: get dprefclk ss info from integration info table Sasha Levin
2023-12-26 0:19 ` [PATCH AUTOSEL 6.6 35/39] pinctrl: cy8c95x0: Fix typo Sasha Levin
2023-12-26 0:19 ` [PATCH AUTOSEL 6.6 36/39] pinctrl: cy8c95x0: Fix regression Sasha Levin
2023-12-26 0:19 ` [PATCH AUTOSEL 6.6 37/39] pinctrl: cy8c95x0: Fix get_pincfg Sasha Levin
2023-12-26 0:19 ` [PATCH AUTOSEL 6.6 38/39] posix-timers: Get rid of [COMPAT_]SYS_NI() uses Sasha Levin
2023-12-26 0:19 ` Sasha Levin [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231226002021.4776-39-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=willy@infradead.org \
--cc=wzhmmmmm@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox