Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c50e8d2 authored by Sreekanth Reddy's avatar Sreekanth Reddy Committed by James Bottomley
Browse files

[SCSI] mpt2sas: Infinite loop can occur if MPI2_IOCSTATUS_CONFIG_INVALID_PAGE is not returned 



Infinite loop can occur if IOCStatus is not equal to
MPI2_IOCSTATUS_CONFIG_INVALID_PAGE value in the while loops in functions
_scsih_search_responding_sas_devices,
_scsih_search_responding_raid_devices and
_scsih_search_responding_expanders

So, Instead of checking for MPI2_IOCSTATUS_CONFIG_INVALID_PAGE value,
in this patch code is modified to check for IOCStatus not equals to
MPI2_IOCSTATUS_SUCCESS to break the while loop.

Signed-off-by: default avatarSreekanth Reddy <Sreekanth.Reddy@lsi.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent d648d5a9

drivers/scsi/mpt2sas/mpt2sas_scsih.c

+4 −12
Original line number Diff line number Diff line
@@ -6753,7 +6753,7 @@ _scsih_search_responding_sas_devices(struct MPT2SAS_ADAPTER *ioc) 
	    handle))) {

		ioc_status = le16_to_cpu(mpi_reply.IOCStatus) &

		    MPI2_IOCSTATUS_MASK;

		if (ioc_status == MPI2_IOCSTATUS_CONFIG_INVALID_PAGE)

		if (ioc_status != MPI2_IOCSTATUS_SUCCESS)

			break;

		handle = le16_to_cpu(sas_device_pg0.DevHandle);

		device_info = le32_to_cpu(sas_device_pg0.DeviceInfo);
@@ -6862,7 +6862,7 @@ _scsih_search_responding_raid_devices(struct MPT2SAS_ADAPTER *ioc) 
	    &volume_pg1, MPI2_RAID_VOLUME_PGAD_FORM_GET_NEXT_HANDLE, handle))) {

		ioc_status = le16_to_cpu(mpi_reply.IOCStatus) &

		    MPI2_IOCSTATUS_MASK;

		if (ioc_status == MPI2_IOCSTATUS_CONFIG_INVALID_PAGE)

		if (ioc_status != MPI2_IOCSTATUS_SUCCESS)

			break;

		handle = le16_to_cpu(volume_pg1.DevHandle);
@@ -6887,7 +6887,7 @@ _scsih_search_responding_raid_devices(struct MPT2SAS_ADAPTER *ioc) 
		    phys_disk_num))) {

			ioc_status = le16_to_cpu(mpi_reply.IOCStatus) &

			    MPI2_IOCSTATUS_MASK;

			if (ioc_status == MPI2_IOCSTATUS_CONFIG_INVALID_PAGE)

			if (ioc_status != MPI2_IOCSTATUS_SUCCESS)

				break;

			phys_disk_num = pd_pg0.PhysDiskNum;

			handle = le16_to_cpu(pd_pg0.DevHandle);
@@ -6967,7 +6967,7 @@ _scsih_search_responding_expanders(struct MPT2SAS_ADAPTER *ioc) 


		ioc_status = le16_to_cpu(mpi_reply.IOCStatus) &

		    MPI2_IOCSTATUS_MASK;

		if (ioc_status == MPI2_IOCSTATUS_CONFIG_INVALID_PAGE)

		if (ioc_status != MPI2_IOCSTATUS_SUCCESS)

			break;



		handle = le16_to_cpu(expander_pg0.DevHandle);
@@ -7109,8 +7109,6 @@ _scsih_scan_for_devices_after_reset(struct MPT2SAS_ADAPTER *ioc) 
	    MPI2_SAS_EXPAND_PGAD_FORM_GET_NEXT_HNDL, handle))) {

		ioc_status = le16_to_cpu(mpi_reply.IOCStatus) &

		    MPI2_IOCSTATUS_MASK;

		if (ioc_status == MPI2_IOCSTATUS_CONFIG_INVALID_PAGE)

			break;

		if (ioc_status != MPI2_IOCSTATUS_SUCCESS) {

			printk(MPT2SAS_INFO_FMT "\tbreak from expander scan: "

				"ioc_status(0x%04x), loginfo(0x%08x)\n",
@@ -7153,8 +7151,6 @@ _scsih_scan_for_devices_after_reset(struct MPT2SAS_ADAPTER *ioc) 
	    phys_disk_num))) {

		ioc_status = le16_to_cpu(mpi_reply.IOCStatus) &

		    MPI2_IOCSTATUS_MASK;

		if (ioc_status == MPI2_IOCSTATUS_CONFIG_INVALID_PAGE)

			break;

		if (ioc_status != MPI2_IOCSTATUS_SUCCESS) {

			printk(MPT2SAS_INFO_FMT "\tbreak from phys disk scan:"

				"ioc_status(0x%04x), loginfo(0x%08x)\n",
@@ -7219,8 +7215,6 @@ _scsih_scan_for_devices_after_reset(struct MPT2SAS_ADAPTER *ioc) 
	    &volume_pg1, MPI2_RAID_VOLUME_PGAD_FORM_GET_NEXT_HANDLE, handle))) {

		ioc_status = le16_to_cpu(mpi_reply.IOCStatus) &

		    MPI2_IOCSTATUS_MASK;

		if (ioc_status == MPI2_IOCSTATUS_CONFIG_INVALID_PAGE)

			break;

		if (ioc_status != MPI2_IOCSTATUS_SUCCESS) {

			printk(MPT2SAS_INFO_FMT "\tbreak from volume scan: "

				"ioc_status(0x%04x), loginfo(0x%08x)\n",
@@ -7278,8 +7272,6 @@ _scsih_scan_for_devices_after_reset(struct MPT2SAS_ADAPTER *ioc) 
	    handle))) {

		ioc_status = le16_to_cpu(mpi_reply.IOCStatus) &

		    MPI2_IOCSTATUS_MASK;

		if (ioc_status == MPI2_IOCSTATUS_CONFIG_INVALID_PAGE)

			break;

		if (ioc_status != MPI2_IOCSTATUS_SUCCESS) {

			printk(MPT2SAS_INFO_FMT "\tbreak from end device scan:"

				" ioc_status(0x%04x), loginfo(0x%08x)\n",