From c76083f036ffa21ab9a30926ad22fe929bcd3d9e Mon Sep 17 00:00:00 2001 From: Vladislav Bolkhovitin Date: Sat, 25 Oct 2008 17:14:08 +0000 Subject: [PATCH] Fixes 2 incorrectly used variables Signed off by: Richard Sharpe git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@541 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/src/dev_handlers/scst_vdisk.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scst/src/dev_handlers/scst_vdisk.c b/scst/src/dev_handlers/scst_vdisk.c index ebd31f66f..8b9adbf5c 100644 --- a/scst/src/dev_handlers/scst_vdisk.c +++ b/scst/src/dev_handlers/scst_vdisk.c @@ -1191,7 +1191,7 @@ static void vdisk_exec_inquiry(struct scst_cmd *cmd) if (strlen(virt_dev->usn) > MAX_USN_LEN) usn_len = MAX_USN_LEN; else - usn_len = len; + usn_len = strlen(virt_dev->usn); buf[3] = usn_len; strncpy(&buf[4], virt_dev->usn, usn_len); } @@ -1213,9 +1213,9 @@ static void vdisk_exec_inquiry(struct scst_cmd *cmd) memset(&buf[num + 12], ' ', 16); i = strlen(virt_dev->name); i = i < 16 ? i : 16; - memcpy(&buf[num + 12], virt_dev->name, len); - memcpy(&buf[num + 28], dev_id_str, len); - buf[num + 3] = 8 + 16 + len; + memcpy(&buf[num + 12], virt_dev->name, i); + memcpy(&buf[num + 28], dev_id_str, i); + buf[num + 3] = 8 + 16 + i; num += buf[num + 3] + 4; /* NAA IEEE registered identifier (faked) */ buf[num] = 0x1; /* binary */