Skip to content

Commit 42f6870

Browse files
suganathprabu0512martinkpetersen
authored andcommitted
scsi: mpt3sas: Fix ioctl timeout
Commit c1a6c5a ("scsi: mpt3sas: For NVME device, issue a protocol level reset") modified the ioctl path 'timeout' variable type to u8 from unsigned long, limiting the maximum timeout value that the driver can support to 255 seconds. If the management application is requesting a higher value the resulting timeout will be zero. The operation times out immediately and the ioctl request fails. Change datatype back to unsigned long. Link: https://lore.kernel.org/r/20201125094838.4340-1-suganath-prabu.subramani@broadcom.com Fixes: c1a6c5a ("scsi: mpt3sas: For NVME device, issue a protocol level reset") Cc: <stable@vger.kernel.org> #v4.18+ Signed-off-by: Suganath Prabu S <suganath-prabu.subramani@broadcom.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
1 parent 3b8c72d commit 42f6870

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

drivers/scsi/mpt3sas/mpt3sas_ctl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -664,7 +664,7 @@ _ctl_do_mpt_command(struct MPT3SAS_ADAPTER *ioc, struct mpt3_ioctl_command karg,
664664
Mpi26NVMeEncapsulatedRequest_t *nvme_encap_request = NULL;
665665
struct _pcie_device *pcie_device = NULL;
666666
u16 smid;
667-
u8 timeout;
667+
unsigned long timeout;
668668
u8 issue_reset;
669669
u32 sz, sz_arg;
670670
void *psge;

0 commit comments

Comments
 (0)