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

Commit 58932e96 authored by Wei Yongjun's avatar Wei Yongjun Committed by Nicholas Bellinger
Browse files

target/pscsi: fix return value check 



In case of error, the function scsi_host_lookup() returns NULL
pointer not ERR_PTR(). The IS_ERR() test in the return value check
should be replaced with NULL test.

Signed-off-by: default avatarWei Yongjun <yongjun_wei@trendmicro.com.cn>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent 48502ddb

drivers/target/target_core_pscsi.c

+4 −4
Original line number Diff line number Diff line
@@ -134,10 +134,10 @@ static int pscsi_pmode_enable_hba(struct se_hba *hba, unsigned long mode_flag) 
	 * pSCSI Host ID and enable for phba mode

	 */

	sh = scsi_host_lookup(phv->phv_host_id);

	if (IS_ERR(sh)) {

	if (!sh) {

		pr_err("pSCSI: Unable to locate SCSI Host for"

			" phv_host_id: %d\n", phv->phv_host_id);

		return PTR_ERR(sh);

		return -EINVAL;

	}



	phv->phv_lld_host = sh;
@@ -515,10 +515,10 @@ static int pscsi_configure_device(struct se_device *dev) 
			sh = phv->phv_lld_host;

		} else {

			sh = scsi_host_lookup(pdv->pdv_host_id);

			if (IS_ERR(sh)) {

			if (!sh) {

				pr_err("pSCSI: Unable to locate"

					" pdv_host_id: %d\n", pdv->pdv_host_id);

				return PTR_ERR(sh);

				return -EINVAL;

			}

		}

	} else {