From: "Gustavo A. R. Silva" <gustavoars@kernel.org>
To: Randy Dunlap <rdunlap@infradead.org>,
Alexander Usyskin <alexander.usyskin@intel.com>,
Miquel Raynal <miquel.raynal@bootlin.com>,
Richard Weinberger <richard@nod.at>,
Vignesh Raghavendra <vigneshr@ti.com>,
Rodrigo Vivi <rodrigo.vivi@intel.com>,
Raag Jadav <raag.jadav@intel.com>,
Tomas Winkler <tomasw@gmail.com>
Cc: linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org,
"Gustavo A. R. Silva" <gustavoars@kernel.org>,
linux-hardening@vger.kernel.org
Subject: [PATCH] mtd: intel-dg: fix array-index-out-of-bounds in intel_dg_mtd_probe()
Date: Sat, 20 Dec 2025 15:41:49 +0900 [thread overview]
Message-ID: <aUZFLezigzZQVt55@kspp> (raw)
Fix the UBSAN: array-index-out-of-bounds issue below by updating
counter nvm->nregions before the first access to flexible-array
member nvm->regions[].
from kernel bugzilla:
https://bugzilla.kernel.org/show_bug.cgi?id=220823
Dec 15 22:01:52 orpheus kernel: UBSAN: array-index-out-of-bounds in /var/tmp/portage/sys-kernel/gentoo-kernel-6.18.1/work/linux-6.18/drivers/mtd/devices/mtd_intel_dg.c:750:15
Notice that this flexible array is annotated with the counted_by()
attribute, hence the counter must always be updated before the
first access to the array.
Cc: stable@vger.kernel.org
Fixes: ceb5ab3cb646 ("mtd: add driver for intel graphics non-volatile memory device")
Reported-by: Randy Dunlap <rdunlap@infradead.org>
Closes: https://lore.kernel.org/linux-hardening/90e419ad-4036-4669-a4cc-8ce5d29e464b@infradead.org/
Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
---
drivers/mtd/devices/mtd_intel_dg.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/mtd/devices/mtd_intel_dg.c b/drivers/mtd/devices/mtd_intel_dg.c
index 2bab30dcd35f..d3e89fe324b8 100644
--- a/drivers/mtd/devices/mtd_intel_dg.c
+++ b/drivers/mtd/devices/mtd_intel_dg.c
@@ -768,6 +768,9 @@ static int intel_dg_mtd_probe(struct auxiliary_device *aux_dev,
if (!nvm)
return -ENOMEM;
+ /* Update nvm->nregions before first access to nvm->regions[] below. */
+ nvm->nregions = nregions;
+
kref_init(&nvm->refcnt);
mutex_init(&nvm->lock);
--
2.43.0
next reply other threads:[~2025-12-20 6:41 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-12-20 6:41 Gustavo A. R. Silva [this message]
2025-12-20 7:05 ` [PATCH] mtd: intel-dg: fix array-index-out-of-bounds in intel_dg_mtd_probe() Randy Dunlap
2025-12-20 7:07 ` Raag Jadav
2025-12-20 7:12 ` Gustavo A. R. Silva
2026-01-07 23:17 ` Randy Dunlap
2026-01-09 9:41 ` Raag Jadav
2026-01-09 13:50 ` Miquel Raynal
2026-01-09 15:16 ` Raag Jadav
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=aUZFLezigzZQVt55@kspp \
--to=gustavoars@kernel.org \
--cc=alexander.usyskin@intel.com \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=miquel.raynal@bootlin.com \
--cc=raag.jadav@intel.com \
--cc=rdunlap@infradead.org \
--cc=richard@nod.at \
--cc=rodrigo.vivi@intel.com \
--cc=tomasw@gmail.com \
--cc=vigneshr@ti.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