Skip to content

scsi: ufs: Fix UIC result byte and BSG request handling

Stanley Jhu linux-scsi lkml stable 2 versions – Applied

Status from this message: Applied to 7.4/scsi-staging, thanks!

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest5 patches 11 repliesApplied
  2. v13 patches 9 repliesSuperseded

Patches in v2 Applied

#Subject and filesSizeRepliesApplied
1/5scsi: ufs: bsg: Complete the job on errordrivers/ufs/core/ufs_bsg.c+3 -52 replies
2/5scsi: ufs: bsg: Clear the reply buffer before usedrivers/ufs/core/ufs_bsg.c+1 -12 replies
3/5scsi: ufs: bsg: Validate request_len before accessing requestdrivers/ufs/core/ufs_bsg.c+9 -00 replies
4/5scsi: ufs: bsg: Reject UIC commands with a non-zero result bytedrivers/ufs/core/ufs_bsg.c+4 -01 reply
5/5scsi: ufs: core: Clear stale UIC result byte before peer DME retriesdrivers/ufs/core/ufshcd.c+7 -22 replies

Reviews trailers per patch

All 5 patches have a Reviewed-by or Acked-by of their own; the series has one for all of them.

PatchBean HuoPeter WangBart Van Assche
SeriesR-b R-b
1/5R-b
2/5R-b
3/5R-b
4/5R-b
5/5R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 3 reviewers.

Read the v2 thread

Cover letter [PATCH v2 0/5] scsi: ufs: Fix UIC result byte and BSG request handling

ufs-bsg fixes for issues found by fuzzing /dev/bsg/ufs-bsg* with syzkaller on QEMU's emulated UFS host controller and in review of v1, plus a fix for peer DME retries.

Patch 1 completes failed BSG requests via bsg_job_done() so error paths do not leak the job's device reference and mapped scatterlists. Patch 2 clears the reused reply buffer so replies do not carry bytes from an earlier request.
Patch 3 rejects requests shorter than the UFS BSG request structures. Patch 4 rejects UIC commands with a non-zero result byte from userspace. Patch 5 clears the stale UIC result byte and restores argument3 before peer DME retries.

Patches 1-2 also address the sashiko review of the bsg reply_len patch:
https://lore.kernel.org/all/[email protected]/

Tested on QEMU arm64: the reproducers no longer trigger.

Differences from v1:
- New patch 1/5: complete failed jobs via bsg_job_done().
- New patch 2/5: clear the reply buffer on entry.
- Patch 4/5: reject non-zero UIC result byte with -EINVAL (Bart).
- Patch 5/5: restore argument3 on each retry in ufshcd_dme_set_attr().

Stanley Jhu (5):
scsi: ufs: bsg: Complete the job on error
scsi: ufs: bsg: Clear the reply buffer before use
scsi: ufs: bsg: Validate request_len before accessing request
scsi: ufs: bsg: Reject UIC commands with a non-zero result byte
scsi: ufs: core: Clear stale UIC result byte before peer DME retries

 drivers/ufs/core/ufs_bsg.c | 23 +++++++++++++++++------
 drivers/ufs/core/ufshcd.c  |  9 +++++++--
 2 files changed, 24 insertions(+), 8 deletions(-)

base-commit: 9621cbd332862eb6651e2aba24ed18f66560de66

Signature · 1 line
2.56.0.385.gd3acb90ef8-goog