Commit b2da4abf authored by David Disseldorp's avatar David Disseldorp Committed by Martin K. Petersen
Browse files

scsi: target: consistently null-terminate t10_wwn strings 



In preparation for supporting user provided vendor strings, add an extra
byte to the vendor, model and revision arrays in struct t10_wwn. This
ensures that the full INQUIRY data can be carried in the arrays along with
a null-terminator.

Change a number of array readers and writers so that they account for
explicit null-termination:

- The pscsi_set_inquiry_info() and emulate_model_alias_store() codepaths
  don't currently explicitly null-terminate; fix this.

- Existing t10_wwn field dumps use for-loops which step over
  null-terminators for right-padding.
  + Use printf with width specifiers instead.

Signed-off-by: default avatarDavid Disseldorp <ddiss@suse.de>
Reviewed-by: default avatarRoman Bolshakov <r.bolshakov@yadro.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 0de26357

drivers/target/target_core_configfs.c

+11 −5
Original line number Original line Diff line number Diff line
@@ -620,12 +620,17 @@ static void dev_set_t10_wwn_model_alias(struct se_device *dev) 
	const char *configname;

	const char *configname;





	configname = config_item_name(&dev->dev_group.cg_item);

	configname = config_item_name(&dev->dev_group.cg_item);

	if (strlen(configname) >= 16) {

	if (strlen(configname) >= INQUIRY_MODEL_LEN) {

		pr_warn("dev[%p]: Backstore name '%s' is too long for "

		pr_warn("dev[%p]: Backstore name '%s' is too long for "

			"INQUIRY_MODEL, truncating to 16 bytes\n", dev,

			"INQUIRY_MODEL, truncating to 15 characters\n", dev,

			configname);

			configname);

	}

	}

	snprintf(&dev->t10_wwn.model[0], 16, "%s", configname);

	/*

	 * XXX We can't use sizeof(dev->t10_wwn.model) (INQUIRY_MODEL_LEN + 1)

	 * here without potentially breaking existing setups, so continue to

	 * truncate one byte shorter than what can be carried in INQUIRY.

	 */

	strlcpy(dev->t10_wwn.model, configname, INQUIRY_MODEL_LEN);

}

}





static ssize_t emulate_model_alias_store(struct config_item *item,

static ssize_t emulate_model_alias_store(struct config_item *item,
@@ -647,11 +652,12 @@ static ssize_t emulate_model_alias_store(struct config_item *item, 
	if (ret < 0)

	if (ret < 0)

		return ret;

		return ret;





	BUILD_BUG_ON(sizeof(dev->t10_wwn.model) != INQUIRY_MODEL_LEN + 1);

	if (flag) {

	if (flag) {

		dev_set_t10_wwn_model_alias(dev);

		dev_set_t10_wwn_model_alias(dev);

	} else {

	} else {

		strncpy(&dev->t10_wwn.model[0],

		strlcpy(dev->t10_wwn.model, dev->transport->inquiry_prod,

			dev->transport->inquiry_prod, 16);

			sizeof(dev->t10_wwn.model));

	}

	}

	da->emulate_model_alias = flag;

	da->emulate_model_alias = flag;

	return count;

	return count;

drivers/target/target_core_device.c

+14 −32
Original line number Original line Diff line number Diff line
@@ -720,36 +720,17 @@ void core_dev_free_initiator_node_lun_acl( 
static void scsi_dump_inquiry(struct se_device *dev)

static void scsi_dump_inquiry(struct se_device *dev)

{

{

	struct t10_wwn *wwn = &dev->t10_wwn;

	struct t10_wwn *wwn = &dev->t10_wwn;

	char buf[17];

	int device_type = dev->transport->get_device_type(dev);

	int i, device_type;



	/*

	/*

	 * Print Linux/SCSI style INQUIRY formatting to the kernel ring buffer

	 * Print Linux/SCSI style INQUIRY formatting to the kernel ring buffer

	 */

	 */

	for (i = 0; i < 8; i++)

	pr_debug("  Vendor: %-" __stringify(INQUIRY_VENDOR_LEN) "s\n",

		if (wwn->vendor[i] >= 0x20)

		wwn->vendor);

			buf[i] = wwn->vendor[i];

	pr_debug("  Model: %-" __stringify(INQUIRY_MODEL_LEN) "s\n",

		else

		wwn->model);

			buf[i] = ' ';

	pr_debug("  Revision: %-" __stringify(INQUIRY_REVISION_LEN) "s\n",

	buf[i] = '\0';

		wwn->revision);

	pr_debug("  Vendor: %s\n", buf);



	for (i = 0; i < 16; i++)

		if (wwn->model[i] >= 0x20)

			buf[i] = wwn->model[i];

		else

			buf[i] = ' ';

	buf[i] = '\0';

	pr_debug("  Model: %s\n", buf);



	for (i = 0; i < 4; i++)

		if (wwn->revision[i] >= 0x20)

			buf[i] = wwn->revision[i];

		else

			buf[i] = ' ';

	buf[i] = '\0';

	pr_debug("  Revision: %s\n", buf);



	device_type = dev->transport->get_device_type(dev);

	pr_debug("  Type:   %s ", scsi_device_type(device_type));

	pr_debug("  Type:   %s ", scsi_device_type(device_type));

}

}
@@ -997,11 +978,12 @@ int target_configure_device(struct se_device *dev) 
	 * passthrough because this is being provided by the backend LLD.

	 * passthrough because this is being provided by the backend LLD.

	 */

	 */

	if (!(dev->transport->transport_flags & TRANSPORT_FLAG_PASSTHROUGH)) {

	if (!(dev->transport->transport_flags & TRANSPORT_FLAG_PASSTHROUGH)) {

		strncpy(&dev->t10_wwn.vendor[0], "LIO-ORG", 8);

		strlcpy(dev->t10_wwn.vendor, "LIO-ORG",

		strncpy(&dev->t10_wwn.model[0],

			sizeof(dev->t10_wwn.vendor));

			dev->transport->inquiry_prod, 16);

		strlcpy(dev->t10_wwn.model, dev->transport->inquiry_prod,

		strncpy(&dev->t10_wwn.revision[0],

			sizeof(dev->t10_wwn.model));

			dev->transport->inquiry_rev, 4);

		strlcpy(dev->t10_wwn.revision, dev->transport->inquiry_rev,

			sizeof(dev->t10_wwn.revision));

	}

	}





	scsi_dump_inquiry(dev);

	scsi_dump_inquiry(dev);

drivers/target/target_core_pscsi.c

+16 −34
Original line number Original line Diff line number Diff line
@@ -179,20 +179,20 @@ static void pscsi_tape_read_blocksize(struct se_device *dev, 
static void

static void

pscsi_set_inquiry_info(struct scsi_device *sdev, struct t10_wwn *wwn)

pscsi_set_inquiry_info(struct scsi_device *sdev, struct t10_wwn *wwn)

{

{

	unsigned char *buf;



	if (sdev->inquiry_len < INQUIRY_LEN)

	if (sdev->inquiry_len < INQUIRY_LEN)

		return;

		return;



	buf = sdev->inquiry;

	if (!buf)

		return;

	/*

	/*

	 * Use sdev->inquiry from drivers/scsi/scsi_scan.c:scsi_alloc_sdev()

	 * Use sdev->inquiry data from drivers/scsi/scsi_scan.c:scsi_add_lun()

	 */

	 */

	memcpy(&wwn->vendor[0], &buf[8], sizeof(wwn->vendor));

	BUILD_BUG_ON(sizeof(wwn->vendor) != INQUIRY_VENDOR_LEN + 1);

	memcpy(&wwn->model[0], &buf[16], sizeof(wwn->model));

	snprintf(wwn->vendor, sizeof(wwn->vendor),

	memcpy(&wwn->revision[0], &buf[32], sizeof(wwn->revision));

		 "%." __stringify(INQUIRY_VENDOR_LEN) "s", sdev->vendor);

	BUILD_BUG_ON(sizeof(wwn->model) != INQUIRY_MODEL_LEN + 1);

	snprintf(wwn->model, sizeof(wwn->model),

		 "%." __stringify(INQUIRY_MODEL_LEN) "s", sdev->model);

	BUILD_BUG_ON(sizeof(wwn->revision) != INQUIRY_REVISION_LEN + 1);

	snprintf(wwn->revision, sizeof(wwn->revision),

		 "%." __stringify(INQUIRY_REVISION_LEN) "s", sdev->rev);

}

}





static int

static int
@@ -811,7 +811,6 @@ static ssize_t pscsi_show_configfs_dev_params(struct se_device *dev, char *b) 
	struct scsi_device *sd = pdv->pdv_sd;

	struct scsi_device *sd = pdv->pdv_sd;

	unsigned char host_id[16];

	unsigned char host_id[16];

	ssize_t bl;

	ssize_t bl;

	int i;





	if (phv->phv_mode == PHV_VIRTUAL_HOST_ID)

	if (phv->phv_mode == PHV_VIRTUAL_HOST_ID)

		snprintf(host_id, 16, "%d", pdv->pdv_host_id);

		snprintf(host_id, 16, "%d", pdv->pdv_host_id);
@@ -824,29 +823,12 @@ static ssize_t pscsi_show_configfs_dev_params(struct se_device *dev, char *b) 
		host_id);

		host_id);





	if (sd) {

	if (sd) {

		bl += sprintf(b + bl, "        ");

		bl += sprintf(b + bl, "        Vendor: %."

		bl += sprintf(b + bl, "Vendor: ");

			__stringify(INQUIRY_VENDOR_LEN) "s", sd->vendor);

		for (i = 0; i < 8; i++) {

		bl += sprintf(b + bl, " Model: %."

			if (ISPRINT(sd->vendor[i]))   /* printable character? */

			__stringify(INQUIRY_MODEL_LEN) "s", sd->model);

				bl += sprintf(b + bl, "%c", sd->vendor[i]);

		bl += sprintf(b + bl, " Rev: %."

			else

			__stringify(INQUIRY_REVISION_LEN) "s\n", sd->rev);

				bl += sprintf(b + bl, " ");

		}

		bl += sprintf(b + bl, " Model: ");

		for (i = 0; i < 16; i++) {

			if (ISPRINT(sd->model[i]))   /* printable character ? */

				bl += sprintf(b + bl, "%c", sd->model[i]);

			else

				bl += sprintf(b + bl, " ");

		}

		bl += sprintf(b + bl, " Rev: ");

		for (i = 0; i < 4; i++) {

			if (ISPRINT(sd->rev[i]))   /* printable character ? */

				bl += sprintf(b + bl, "%c", sd->rev[i]);

			else

				bl += sprintf(b + bl, " ");

		}

		bl += sprintf(b + bl, "\n");

	}

	}

	return bl;

	return bl;

}

}

drivers/target/target_core_spc.c

+4 −3
Original line number Original line Diff line number Diff line
@@ -113,12 +113,13 @@ spc_emulate_inquiry_std(struct se_cmd *cmd, unsigned char *buf) 
	 * unused bytes at the end of the field (i.e., highest offset) and the

	 * unused bytes at the end of the field (i.e., highest offset) and the

	 * unused bytes shall be filled with ASCII space characters (20h).

	 * unused bytes shall be filled with ASCII space characters (20h).

	 */

	 */

	memset(&buf[8], 0x20, 8 + 16 + 4);

	memset(&buf[8], 0x20,

	       INQUIRY_VENDOR_LEN + INQUIRY_MODEL_LEN + INQUIRY_REVISION_LEN);

	memcpy(&buf[8], "LIO-ORG", sizeof("LIO-ORG") - 1);

	memcpy(&buf[8], "LIO-ORG", sizeof("LIO-ORG") - 1);

	memcpy(&buf[16], dev->t10_wwn.model,

	memcpy(&buf[16], dev->t10_wwn.model,

	       strnlen(dev->t10_wwn.model, 16));

	       strnlen(dev->t10_wwn.model, INQUIRY_MODEL_LEN));

	memcpy(&buf[32], dev->t10_wwn.revision,

	memcpy(&buf[32], dev->t10_wwn.revision,

	       strnlen(dev->t10_wwn.revision, 4));

	       strnlen(dev->t10_wwn.revision, INQUIRY_REVISION_LEN));

	buf[4] = 31; /* Set additional length to 31 */

	buf[4] = 31; /* Set additional length to 31 */





	return 0;

	return 0;

drivers/target/target_core_stat.c

+7 −25
Original line number Original line Diff line number Diff line
@@ -246,43 +246,25 @@ static ssize_t target_stat_lu_lu_name_show(struct config_item *item, char *page) 
static ssize_t target_stat_lu_vend_show(struct config_item *item, char *page)

static ssize_t target_stat_lu_vend_show(struct config_item *item, char *page)

{

{

	struct se_device *dev = to_stat_lu_dev(item);

	struct se_device *dev = to_stat_lu_dev(item);

	int i;

	char str[sizeof(dev->t10_wwn.vendor)+1];





	/* scsiLuVendorId */

	return snprintf(page, PAGE_SIZE, "%-" __stringify(INQUIRY_VENDOR_LEN)

	for (i = 0; i < sizeof(dev->t10_wwn.vendor); i++)

			"s\n", dev->t10_wwn.vendor);

		str[i] = ISPRINT(dev->t10_wwn.vendor[i]) ?

			dev->t10_wwn.vendor[i] : ' ';

	str[i] = '\0';

	return snprintf(page, PAGE_SIZE, "%s\n", str);

}

}





static ssize_t target_stat_lu_prod_show(struct config_item *item, char *page)

static ssize_t target_stat_lu_prod_show(struct config_item *item, char *page)

{

{

	struct se_device *dev = to_stat_lu_dev(item);

	struct se_device *dev = to_stat_lu_dev(item);

	int i;

	char str[sizeof(dev->t10_wwn.model)+1];





	/* scsiLuProductId */

	return snprintf(page, PAGE_SIZE, "%-" __stringify(INQUIRY_MODEL_LEN)

	for (i = 0; i < sizeof(dev->t10_wwn.model); i++)

			"s\n", dev->t10_wwn.model);

		str[i] = ISPRINT(dev->t10_wwn.model[i]) ?

			dev->t10_wwn.model[i] : ' ';

	str[i] = '\0';

	return snprintf(page, PAGE_SIZE, "%s\n", str);

}

}





static ssize_t target_stat_lu_rev_show(struct config_item *item, char *page)

static ssize_t target_stat_lu_rev_show(struct config_item *item, char *page)

{

{

	struct se_device *dev = to_stat_lu_dev(item);

	struct se_device *dev = to_stat_lu_dev(item);

	int i;



	char str[sizeof(dev->t10_wwn.revision)+1];

	return snprintf(page, PAGE_SIZE, "%-" __stringify(INQUIRY_REVISION_LEN)



			"s\n", dev->t10_wwn.revision);

	/* scsiLuRevisionId */

	for (i = 0; i < sizeof(dev->t10_wwn.revision); i++)

		str[i] = ISPRINT(dev->t10_wwn.revision[i]) ?

			dev->t10_wwn.revision[i] : ' ';

	str[i] = '\0';

	return snprintf(page, PAGE_SIZE, "%s\n", str);

}

}





static ssize_t target_stat_lu_dev_type_show(struct config_item *item, char *page)

static ssize_t target_stat_lu_dev_type_show(struct config_item *item, char *page)