diff options
author | Nicholas Bellinger <nab@linux-iscsi.org> | 2013-07-24 16:15:08 -0700 |
---|---|---|
committer | Steven Rostedt <rostedt@goodmis.org> | 2013-09-11 21:21:29 -0400 |
commit | e02491a21ab70a7e67933f95809b3165f53b20e1 (patch) | |
tree | a2a56fe03677e88f15fcb5d6071ff16fc0587ca2 | |
parent | 6a885cdc6806ffe29c2b89d84fc0f7384d6dd50b (diff) | |
download | linux-rt-e02491a21ab70a7e67933f95809b3165f53b20e1.tar.gz |
target: Fix trailing ASCII space usage in INQUIRY vendor+model
[ Upstream commit ee60bddba5a5f23e39598195d944aa0eb2d455e5 ]
This patch fixes spc_emulate_inquiry_std() to add trailing ASCII
spaces for INQUIRY vendor + model fields following SPC-4 text:
"ASCII data fields described as being left-aligned shall have any
unused bytes at the end of the field (i.e., highest offset) and
the unused bytes shall be filled with ASCII space characters (20h)."
This addresses a problem with Falconstor NSS multipathing.
Reported-by: Tomas Molota <tomas.molota@lightstorm.sk>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
-rw-r--r-- | drivers/target/target_core_spc.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/target/target_core_spc.c b/drivers/target/target_core_spc.c index 6fd434d3d7e4..290041b3b101 100644 --- a/drivers/target/target_core_spc.c +++ b/drivers/target/target_core_spc.c @@ -100,9 +100,12 @@ static int spc_emulate_inquiry_std(struct se_cmd *cmd, char *buf) buf[7] = 0x2; /* CmdQue=1 */ - snprintf(&buf[8], 8, "LIO-ORG"); - snprintf(&buf[16], 16, "%s", dev->se_sub_dev->t10_wwn.model); - snprintf(&buf[32], 4, "%s", dev->se_sub_dev->t10_wwn.revision); + memcpy(&buf[8], "LIO-ORG ", 8); + memset(&buf[16], 0x20, 16); + memcpy(&buf[16], dev->se_sub_dev->t10_wwn.model, + min_t(size_t, strlen(dev->se_sub_dev->t10_wwn.model), 16)); + memcpy(&buf[32], dev->se_sub_dev->t10_wwn.revision, + min_t(size_t, strlen(dev->se_sub_dev->t10_wwn.revision), 4)); buf[4] = 31; /* Set additional length to 31 */ return 0; |