Re: [PATCH-for-3.4.y] target: Fix trailing ASCII space usage in INQUIRY vendor+model

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



"Nicholas A. Bellinger" <nab@xxxxxxxxxxxxxxx> writes:

> From: Nicholas Bellinger <nab@xxxxxxxxxxxxxxx>
>
> commit ee60bddba5a5f23e39598195d944aa0eb2d455e5 upstream.

Thanks, I'm queuing this for the 3.5 kernel as well.

Cheers,
-- 
Luis


>
> 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@xxxxxxxxxxxxx>
> Cc: <stable@xxxxxxxxxxxxxxx> # 3.4.y
> Signed-off-by: Nicholas Bellinger <nab@xxxxxxxxxxxxxxx>
> ---
>  drivers/target/target_core_cdb.c |    9 ++++++---
>  1 files changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/target/target_core_cdb.c b/drivers/target/target_core_cdb.c
> index 52a5f62..2d88ce8 100644
> --- a/drivers/target/target_core_cdb.c
> +++ b/drivers/target/target_core_cdb.c
> @@ -97,9 +97,12 @@ target_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;
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux Kernel]     [Kernel Development Newbies]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite Hiking]     [Linux Kernel]     [Linux SCSI]