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

Commit 1683ce57 authored by Andrew Vasquez's avatar Andrew Vasquez Committed by Martin K. Petersen
Browse files

scsi: qedi: Fix truncation of CHAP name and secret 



The data in NVRAM is not guaranteed to be NUL terminated.  Since
snprintf expects byte-stream to accommodate null byte, the CHAP secret
is truncated.  Use sprintf instead of snprintf to fix the truncation of
CHAP name and secret.

Signed-off-by: default avatarAndrew Vasquez <andrew.vasquez@cavium.com>
Signed-off-by: default avatarNilesh Javali <nilesh.javali@cavium.com>
Reviewed-by: default avatarBart Van Assche <bart.vanassche@wdc.com>
Acked-by: default avatarChris Leech <cleech@redhat.com>
Acked-by: default avatarLee Duncan <lduncan@suse.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent f3767225

drivers/scsi/qedi/qedi_main.c

+12 −12
Original line number Diff line number Diff line
@@ -1830,7 +1830,7 @@ static ssize_t qedi_show_boot_ini_info(void *data, int type, char *buf) 


	switch (type) {

	case ISCSI_BOOT_INI_INITIATOR_NAME:

		rc = snprintf(str, NVM_ISCSI_CFG_ISCSI_NAME_MAX_LEN, "%s\n",

		rc = sprintf(str, "%.*s\n", NVM_ISCSI_CFG_ISCSI_NAME_MAX_LEN,

			     initiator->initiator_name.byte);

		break;

	default:
@@ -1898,7 +1898,7 @@ qedi_show_boot_tgt_info(struct qedi_ctx *qedi, int type, 


	switch (type) {

	case ISCSI_BOOT_TGT_NAME:

		rc = snprintf(str, NVM_ISCSI_CFG_ISCSI_NAME_MAX_LEN, "%s\n",

		rc = sprintf(str, "%.*s\n", NVM_ISCSI_CFG_ISCSI_NAME_MAX_LEN,

			     block->target[idx].target_name.byte);

		break;

	case ISCSI_BOOT_TGT_IP_ADDR:
@@ -1920,19 +1920,19 @@ qedi_show_boot_tgt_info(struct qedi_ctx *qedi, int type, 
			      block->target[idx].lun.value[0]);

		break;

	case ISCSI_BOOT_TGT_CHAP_NAME:

		rc = snprintf(str, NVM_ISCSI_CFG_CHAP_NAME_MAX_LEN, "%s\n",

		rc = sprintf(str, "%.*s\n", NVM_ISCSI_CFG_CHAP_NAME_MAX_LEN,

			     chap_name);

		break;

	case ISCSI_BOOT_TGT_CHAP_SECRET:

		rc = snprintf(str, NVM_ISCSI_CFG_CHAP_PWD_MAX_LEN, "%s\n",

		rc = sprintf(str, "%.*s\n", NVM_ISCSI_CFG_CHAP_NAME_MAX_LEN,

			     chap_secret);

		break;

	case ISCSI_BOOT_TGT_REV_CHAP_NAME:

		rc = snprintf(str, NVM_ISCSI_CFG_CHAP_NAME_MAX_LEN, "%s\n",

		rc = sprintf(str, "%.*s\n", NVM_ISCSI_CFG_CHAP_NAME_MAX_LEN,

			     mchap_name);

		break;

	case ISCSI_BOOT_TGT_REV_CHAP_SECRET:

		rc = snprintf(str, NVM_ISCSI_CFG_CHAP_PWD_MAX_LEN, "%s\n",

		rc = sprintf(str, "%.*s\n", NVM_ISCSI_CFG_CHAP_NAME_MAX_LEN,

			     mchap_secret);

		break;

	case ISCSI_BOOT_TGT_FLAGS: