Logan Gunthorpe <log...@deltatee.com> writes:
> 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.
[...]
> 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: 3d2d75254915 ("[SCSI] isci: T10 DIF support")
> Link:
> http://lkml.kernel.org/r/da851333-eadd-163a-8c78-e1f4ec5ec...@deltatee.com
> Signed-off-by: Logan Gunthorpe <log...@deltatee.com>
> Cc: Intel SCU Linux support <intel-linux-...@intel.com>
> Cc: Artur Paszkiewicz <artur.paszkiew...@intel.com>
> Cc: "James E.J. Bottomley" <j...@linux.ibm.com>
> Cc: "Martin K. Petersen" <martin.peter...@oracle.com>
> Cc: Christoph Hellwig <h...@lst.de>
> Cc: Jens Axboe <ax...@kernel.dk>
> Cc: Jeff Moyer <jmo...@redhat.com>
Nice job, and excellent commit message. We'll need a similar patch for
lpfc.
Reviewed-by: Jeff Moyer <jmo...@redhat.com>
> ---
> drivers/scsi/isci/init.c | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/scsi/isci/init.c b/drivers/scsi/isci/init.c
> index 68b90c4f79a3..1727d0c71b12 100644
> --- a/drivers/scsi/isci/init.c
> +++ b/drivers/scsi/isci/init.c
> @@ -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_prot(shost,
> + SHOST_DIF_TYPE1_PROTECTION |
> + SHOST_DIF_TYPE2_PROTECTION |
> + SHOST_DIF_TYPE3_PROTECTION);
> + 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_prot(to_shost(h),
> - SHOST_DIF_TYPE1_PROTECTION |
> - SHOST_DIF_TYPE2_PROTECTION |
> - SHOST_DIF_TYPE3_PROTECTION);
> - scsi_host_set_guard(to_shost(h), SHOST_DIX_GUARD_CRC);
> }
>
> err = isci_setup_interrupts(pdev);
