shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 11:26:02 +09:00
Code Issues Packages Projects Releases Wiki Activity

FROMGIT: scsi: ufs: core: scsi_get_lba() error fix

Browse Source 
When ufs initializes without scmd->device->sector_size set, scsi_get_lba()
will get a wrong shift number and trigger an ubsan error.  The shift
exponent 4294967286 is too large for the 64-bit type 'sector_t' (aka
'unsigned long long').

Call scsi_get_lba() only when opcode is READ_10/WRITE_10/UNMAP.

Link: https://lore.kernel.org/r/20220307111752.10465-1-peter.wang@mediatek.com
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Peter Wang <peter.wang@mediatek.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
(cherry picked from commit 2bd3b6b759 git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git for-next)
Bug: 204438323
Change-Id: I3457fcc88d7c4164c55010e440d9f274c169553e
Signed-off-by: Bart Van Assche <bvanassche@google.com>
This commit is contained in:
Peter Wang
2022-03-07 19:17:52 +08:00
committed by Todd Kjos
parent c0a4aeb7aa
commit 00ed95fe93
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/scsi/ufs/ufshcd.c
View File

@@ -383,7 +383,7 @@ static void ufshcd_add_uic_command_trace(struct ufs_hba *hba,
static void ufshcd_add_command_trace(struct ufs_hba *hba, unsigned int tag, static void ufshcd_add_command_trace(struct ufs_hba *hba, unsigned int tag,
enum ufs_trace_str_t str_t) enum ufs_trace_str_t str_t)
{ {
u64 lba; u64 lba = 0;
u8 opcode = 0, group_id = 0; u8 opcode = 0, group_id = 0;
u32 intr, doorbell; u32 intr, doorbell;
struct ufshcd_lrb *lrbp = &hba->lrb[tag]; struct ufshcd_lrb *lrbp = &hba->lrb[tag];
@@ -400,7 +400,6 @@ static void ufshcd_add_command_trace(struct ufs_hba *hba, unsigned int tag,
return; return;
opcode = cmd->cmnd[0]; opcode = cmd->cmnd[0];
lba = scsi_get_lba(cmd);
if (opcode == READ_10 || opcode == WRITE_10) { if (opcode == READ_10 || opcode == WRITE_10) {
/* /*
@@ -408,6 +407,7 @@ static void ufshcd_add_command_trace(struct ufs_hba *hba, unsigned int tag,
*/ */
transfer_len = transfer_len =
be32_to_cpu(lrbp->ucd_req_ptr->sc.exp_data_transfer_len); be32_to_cpu(lrbp->ucd_req_ptr->sc.exp_data_transfer_len);
lba = scsi_get_lba(cmd);
if (opcode == WRITE_10) if (opcode == WRITE_10)
group_id = lrbp->cmd->cmnd[6]; group_id = lrbp->cmd->cmnd[6];
} else if (opcode == UNMAP) { } else if (opcode == UNMAP) {
@@ -415,6 +415,7 @@ static void ufshcd_add_command_trace(struct ufs_hba *hba, unsigned int tag,
* The number of Bytes to be unmapped beginning with the lba. * The number of Bytes to be unmapped beginning with the lba.
*/ */
transfer_len = blk_rq_bytes(rq); transfer_len = blk_rq_bytes(rq);
lba = scsi_get_lba(cmd);
} }
intr = ufshcd_readl(hba, REG_INTERRUPT_STATUS); intr = ufshcd_readl(hba, REG_INTERRUPT_STATUS);