Commit cc29a1b0 authored by Logan Gunthorpe's avatar Logan Gunthorpe Committed by Martin K. Petersen
Browse files

scsi: isci: initialize shost fully before calling scsi_add_host()

scsi_mq_setup_tags(), which is called by scsi_add_host(), calculates the
command size to allocate based on the prot_capabilities. In the isci
driver, scsi_host_set_prot() is called after scsi_add_host() so the command
size gets calculated to be smaller than it needs to be.  Eventually,
scsi_mq_init_request() locates the 'prot_sdb' after the command assuming it
was sized correctly and a buffer overrun may occur.

However, seeing blk_mq_alloc_rqs() rounds up to the nearest cache line
size, the mistake can go unnoticed.

The bug was noticed after the struct request size was reduced by commit
9d037ad7 ("block: remove req->timeout_list")

Which likely reduced the allocated space for the request by an entire cache
line, enough that the overflow could be hit and it caused a panic, on boot,

  RIP: 0010:t10_pi_complete+0x77/0x1c0
  Call Trace:

sd_done() would call scsi_prot_sg_count() which reads the number of
entities in 'prot_sdb', but seeing 'prot_sdb' is located after the end of
the allocated space it reads a garbage number and erroneously calls

To prevent this, the calls to scsi_host_set_prot() are moved into
isci_host_alloc() before the call to scsi_add_host(). Out of caution, also
move the similar call to scsi_host_set_guard().

Fixes: 3d2d7525 ("[SCSI] isci: T10 DIF support")

Signed-off-by: default avatarLogan Gunthorpe <>
Cc: Intel SCU Linux support <>
Cc: Artur Paszkiewicz <>
Cc: "James E.J. Bottomley" <>
Cc: "Martin K. Petersen" <>
Cc: Christoph Hellwig <>
Cc: Jens Axboe <>
Cc: Jeff Moyer <>
Reviewed-by: default avatarJeff Moyer <>
Reviewed-by: default avatarJens Axboe <>
Signed-off-by: default avatarMartin K. Petersen <>
parent 5bd5f66c
......@@ -576,6 +576,13 @@ static struct isci_host *isci_host_alloc(struct pci_dev *pdev, int id)
shost->max_lun = ~0;
shost->max_cmd_len = MAX_COMMAND_SIZE;
/* turn on DIF support */
scsi_host_set_guard(shost, SHOST_DIX_GUARD_CRC);
err = scsi_add_host(shost, &pdev->dev);
if (err)
goto err_shost;
......@@ -663,13 +670,6 @@ static int isci_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
goto err_host_alloc;
pci_info->hosts[i] = h;
/* turn on DIF support */
scsi_host_set_guard(to_shost(h), SHOST_DIX_GUARD_CRC);
err = isci_setup_interrupts(pdev);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment