From: Adrian Hunter <adrian.hunter@intel.com>
To: alexandre.belloni@bootlin.com
Cc: Frank.Li@nxp.com, akhilrajeev@nvidia.com,
mukesh.savaliya@oss.qualcomm.com, rafael@kernel.org,
linux-i3c@lists.infradead.org, linux-kernel@vger.kernel.org,
linux-pci@vger.kernel.org, linux-pm@vger.kernel.org
Subject: [PATCH V4 06/14] i3c: master: Fix potential UAF in i3c_device_uevent()
Date: Thu, 6 Aug 2026 16:18:49 +0300 [thread overview]
Message-ID: <20260806131857.119830-7-adrian.hunter@intel.com> (raw)
In-Reply-To: <20260806131857.119830-1-adrian.hunter@intel.com>
i3c_device_uevent() dereferences i3cdev->desc without holding the bus
normal-use lock. Since the descriptor pointer can be replaced
concurrently, including when a uevent is generated from sysfs, this can
result in dereferencing a stale descriptor and lead to a use-after-free.
Use i3c_device_get_info() instead, which protects access to the
descriptor with the normal-use lock.
Commit 6cf7b65f7029 ("i3c: Use i3cdev->desc->info instead of calling
i3c_device_get_info() to avoid deadlock") replaced the accessor with a
direct descriptor dereference because i3c_device_get_info() would
recursively acquire bus->lock during device registration.
This change depends on "i3c: master: Fix recursive locking during device
registration", which moves device registration out from under bus->lock
and removes the possibility of that deadlock. Without that change,
restoring the i3c_device_get_info() call would reintroduce the deadlock.
Fixes: 6cf7b65f7029 ("i3c: Use i3cdev->desc->info instead of calling i3c_device_get_info() to avoid deadlock")
Cc: stable@vger.kernel.org # requires "i3c: master: Fix recursive locking during device registration"
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Acked-by: Mukesh Savaliya <mukesh.savaliya@oss.qualcomm.com>
---
Changes in V4:
Added Mukesh's Acked-by tag
Changes in V3:
New patch
drivers/i3c/master.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/i3c/master.c b/drivers/i3c/master.c
index 2357874bb9d6..ee771ac0b203 100644
--- a/drivers/i3c/master.c
+++ b/drivers/i3c/master.c
@@ -316,8 +316,7 @@ static int i3c_device_uevent(const struct device *dev, struct kobj_uevent_env *e
struct i3c_device_info devinfo;
u16 manuf, part, ext;
- if (i3cdev->desc)
- devinfo = i3cdev->desc->info;
+ i3c_device_get_info(i3cdev, &devinfo);
manuf = I3C_PID_MANUF_ID(devinfo.pid);
part = I3C_PID_PART_ID(devinfo.pid);
ext = I3C_PID_EXTRA_INFO(devinfo.pid);
--
2.53.0
next prev parent reply other threads:[~2026-08-06 13:19 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-08-06 13:18 [PATCH V4 00/14] i3c: Support IBI-based system wakeup Adrian Hunter
2026-08-06 13:18 ` [PATCH V4 01/14] i3c: master: Fix recursive locking during device registration Adrian Hunter
2026-08-06 18:24 ` Frank Li
2026-08-06 13:18 ` [PATCH V4 02/14] i3c: Fix unlocked dereference of dev->desc in i3c_device_get_supported_xfer_mode() Adrian Hunter
2026-08-06 18:26 ` Frank Li
2026-08-06 13:18 ` [PATCH V4 03/14] i3c: master: Do not treat master device as a duplicate target Adrian Hunter
2026-08-06 13:18 ` [PATCH V4 04/14] i3c: master: Fix use-after-free of master->this Adrian Hunter
2026-08-06 18:30 ` Frank Li
2026-08-06 13:18 ` [PATCH V4 05/14] i3c: Make dev->desc locking assumptions explicit Adrian Hunter
2026-08-06 18:31 ` Frank Li
2026-08-06 13:18 ` Adrian Hunter [this message]
2026-08-06 18:33 ` [PATCH V4 06/14] i3c: master: Fix potential UAF in i3c_device_uevent() Frank Li
2026-08-06 13:18 ` [PATCH V4 07/14] i3c: master: Fix potential UAF in i3c_device_match() Adrian Hunter
2026-08-06 13:18 ` [PATCH V4 08/14] i3c: master: Support IBI-based wakeup capability Adrian Hunter
2026-08-06 18:58 ` Mukesh Savaliya
2026-08-06 13:18 ` [PATCH V4 09/14] i3c: master: Report wakeup events for IBIs Adrian Hunter
2026-08-06 18:35 ` Frank Li
2026-08-06 13:18 ` [PATCH V4 10/14] i3c: master: Add helper to query bus wakeup requirements Adrian Hunter
2026-08-06 18:46 ` Frank Li
2026-08-06 19:03 ` Mukesh Savaliya
2026-08-06 13:18 ` [PATCH V4 11/14] i3c: master: Reject IBI requests from non-IBI-capable devices Adrian Hunter
2026-08-06 13:18 ` [PATCH V4 12/14] i3c: mipi-i3c-hci-pci: Propagate I3C wakeup requirements to PCI Adrian Hunter
2026-08-06 18:42 ` Frank Li
2026-08-06 13:18 ` [PATCH V4 13/14] i3c: mipi-i3c-hci: Factor out i3c_hci_sysdev() Adrian Hunter
2026-08-06 18:44 ` Frank Li
2026-08-06 19:07 ` Mukesh Savaliya
2026-08-06 13:18 ` [PATCH V4 14/14] i3c: mipi-i3c-hci: Advertise IBI wakeup capability Adrian Hunter
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=20260806131857.119830-7-adrian.hunter@intel.com \
--to=adrian.hunter@intel.com \
--cc=Frank.Li@nxp.com \
--cc=akhilrajeev@nvidia.com \
--cc=alexandre.belloni@bootlin.com \
--cc=linux-i3c@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=mukesh.savaliya@oss.qualcomm.com \
--cc=rafael@kernel.org \
/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