From: Stanley Jhu <stanleyjhu@google.com>
To: "Martin K . Petersen" <mkp@kernel.org>,
"James E . J . Bottomley"
<James.Bottomley@HansenPartnership.com>,
linux-scsi@vger.kernel.org
Cc: Brian Kao <powenkao@google.com>, Bean Huo <beanhuo@micron.com>,
Bart Van Assche <bvanassche@acm.org>,
Alim Akhtar <alim.akhtar@samsung.com>,
Avri Altman <avri.altman@sandisk.com>,
Peter Wang <peter.wang@mediatek.com>,
Can Guo <can.guo@oss.qualcomm.com>,
Li Qiang <liqiang01@kylinos.cn>, Ao Sun <ao.sun@transsion.com>,
linux-kernel@vger.kernel.org,
Stanley Jhu <stanleyjhu@google.com>
Subject: [PATCH v3 0/2] scsi: ufs: rpmb: Fix bus registration and device lifecycle
Date: Thu, 10 Sep 2026 09:55:01 +0800 [thread overview]
Message-ID: <20260910015503.1991119-1-stanleyjhu@google.com> (raw)
This series fixes bus registration and device lifecycle defects in the
UFS OP-TEE RPMB driver.
Why:
1. ufs_rpmb_bus_type was never registered with bus_register(), causing
device_register() in ufs_rpmb_probe() to unconditionally fail with
-EINVAL.
2. struct ufs_rpmb_dev embeds struct device but was allocated via
devm_kzalloc() tied to hba->dev. On host unbind, devres frees the
structure prematurely while external references remain active,
causing a Use-After-Free (UAF) Oops.
What:
- Patch 1: Register ufs_rpmb_bus_type during ufshcd_core_init() and
unregister it in ufshcd_core_exit(), with stubs for !CONFIG_RPMB.
- Patch 2: Allocate ufs_rpmb with kzalloc_obj() and free it via kfree()
in ufs_rpmb_device_release(). Pin the underlying SCSI WLUN via
scsi_device_get/put() and unregister in ufs_rpmb_remove().
Differences from v2:
- Drop generic RPMB core changes (sent as a separate patch).
- Reorder patches so bus registration comes first for bisectability.
- Call rpmb_dev_unregister() in ufs_rpmb_remove() to break cyclic refcount.
- Pin underlying SCSI WLUN via scsi_device_get/put().
Tested:
- Verified clean probe, RPMB I/O, and unbind on QEMU ARM64 without UAF.
Stanley Jhu (2):
scsi: ufs: rpmb: Register and unregister ufs_rpmb_bus_type
scsi: ufs: rpmb: Decouple device lifecycle from devres to avoid UAF
drivers/ufs/core/ufs-rpmb.c | 107 ++++++++++++++++++++-------------
drivers/ufs/core/ufshcd-priv.h | 13 +++-
drivers/ufs/core/ufshcd.c | 16 ++++-
3 files changed, 91 insertions(+), 45 deletions(-)
--
2.55.0.1007.g17ff1f9808-goog
next reply other threads:[~2026-09-10 1:55 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-10 1:55 Stanley Jhu [this message]
2026-09-10 1:55 ` [PATCH v3 1/2] scsi: ufs: rpmb: Register and unregister ufs_rpmb_bus_type Stanley Jhu
2026-09-10 1:55 ` [PATCH v3 2/2] scsi: ufs: rpmb: Decouple device lifecycle from devres to avoid UAF Stanley Jhu
2026-09-10 2:09 ` sashiko-bot
2026-09-10 2:13 ` Stanley Jhu
2026-09-10 2:06 ` [PATCH v3 0/2] scsi: ufs: rpmb: Fix bus registration and device lifecycle Stanley Jhu
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=20260910015503.1991119-1-stanleyjhu@google.com \
--to=stanleyjhu@google.com \
--cc=James.Bottomley@HansenPartnership.com \
--cc=alim.akhtar@samsung.com \
--cc=ao.sun@transsion.com \
--cc=avri.altman@sandisk.com \
--cc=beanhuo@micron.com \
--cc=bvanassche@acm.org \
--cc=can.guo@oss.qualcomm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=liqiang01@kylinos.cn \
--cc=mkp@kernel.org \
--cc=peter.wang@mediatek.com \
--cc=powenkao@google.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