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

Commit ce31c1b0 authored by Joern Engel's avatar Joern Engel Committed by Nicholas Bellinger
Browse files

target: correctly handle match_int errors in FILEIO + PSCSI 



This patch correctly handles match_int() errors in FILEIO + PSCSI
backend parameter parsing, which can potentially fail due to a
memory allocation failure or invalid argument.

Found by coverity.

Signed-off-by: default avatarJoern Engel <joern@logfs.org>
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent 68edbce4

drivers/target/target_core_file.c

+3 −1
Original line number Diff line number Diff line
@@ -762,7 +762,9 @@ static ssize_t fd_set_configfs_dev_params(struct se_device *dev, 
			fd_dev->fbd_flags |= FBDF_HAS_SIZE;

			break;

		case Opt_fd_buffered_io:

			match_int(args, &arg);

			ret = match_int(args, &arg);

			if (ret)

				goto out;

			if (arg != 1) {

				pr_err("bogus fd_buffered_io=%d value\n", arg);

				ret = -EINVAL;

drivers/target/target_core_pscsi.c

+12 −4
Original line number Diff line number Diff line
@@ -749,14 +749,18 @@ static ssize_t pscsi_set_configfs_dev_params(struct se_device *dev, 
				ret = -EINVAL;

				goto out;

			}

			match_int(args, &arg);

			ret = match_int(args, &arg);

			if (ret)

				goto out;

			pdv->pdv_host_id = arg;

			pr_debug("PSCSI[%d]: Referencing SCSI Host ID:"

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

			pdv->pdv_flags |= PDF_HAS_VIRT_HOST_ID;

			break;

		case Opt_scsi_channel_id:

			match_int(args, &arg);

			ret = match_int(args, &arg);

			if (ret)

				goto out;

			pdv->pdv_channel_id = arg;

			pr_debug("PSCSI[%d]: Referencing SCSI Channel"

				" ID: %d\n",  phv->phv_host_id,
@@ -764,7 +768,9 @@ static ssize_t pscsi_set_configfs_dev_params(struct se_device *dev, 
			pdv->pdv_flags |= PDF_HAS_CHANNEL_ID;

			break;

		case Opt_scsi_target_id:

			match_int(args, &arg);

			ret = match_int(args, &arg);

			if (ret)

				goto out;

			pdv->pdv_target_id = arg;

			pr_debug("PSCSI[%d]: Referencing SCSI Target"

				" ID: %d\n", phv->phv_host_id,
@@ -772,7 +778,9 @@ static ssize_t pscsi_set_configfs_dev_params(struct se_device *dev, 
			pdv->pdv_flags |= PDF_HAS_TARGET_ID;

			break;

		case Opt_scsi_lun_id:

			match_int(args, &arg);

			ret = match_int(args, &arg);

			if (ret)

				goto out;

			pdv->pdv_lun_id = arg;

			pr_debug("PSCSI[%d]: Referencing SCSI LUN ID:"

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