2015-07-22 22:08:48

by Spencer Baugh

[permalink] [raw]
Subject: [PATCH] target: allow underflow/overflow for PR OUT etc. commands

From: Roland Dreier <[email protected]>

It's not necessarily a fatal error if a command with a data-out phase
has a data length that differs from the transport data length (e.g.
PERSISTENT RESERVE OUT might have a parameter list length in the CDB
that's smaller than the FC_DL field), so allow these commands. The
Windows compliance test sends them.

Signed-off-by: Roland Dreier <[email protected]>
Signed-off-by: Spencer Baugh <[email protected]>
---
drivers/target/target_core_transport.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
index ac002a7..f6626bb 100644
--- a/drivers/target/target_core_transport.c
+++ b/drivers/target/target_core_transport.c
@@ -1087,9 +1087,9 @@ target_cmd_size_check(struct se_cmd *cmd, unsigned int size)
" 0x%02x\n", cmd->se_tfo->get_fabric_name(),
cmd->data_length, size, cmd->t_task_cdb[0]);

- if (cmd->data_direction == DMA_TO_DEVICE) {
- pr_err("Rejecting underflow/overflow"
- " WRITE data\n");
+ if (cmd->data_direction == DMA_TO_DEVICE &&
+ cmd->se_cmd_flags & SCF_SCSI_DATA_CDB) {
+ pr_err("Rejecting underflow/overflow WRITE data\n");
return TCM_INVALID_CDB_FIELD;
}
/*
--
2.5.0.rc3


2015-07-23 09:44:37

by Christoph Hellwig

[permalink] [raw]
Subject: Re: [PATCH] target: allow underflow/overflow for PR OUT etc. commands

Looks good,

Reviewed-by: Christoph Hellwig <[email protected]>

(altough normal Linux style would be to add parenthesis around the
logial and)

2015-07-31 06:44:27

by Nicholas A. Bellinger

[permalink] [raw]
Subject: Re: [PATCH] target: allow underflow/overflow for PR OUT etc. commands

On Wed, 2015-07-22 at 15:08 -0700, Spencer Baugh wrote:
> From: Roland Dreier <[email protected]>
>
> It's not necessarily a fatal error if a command with a data-out phase
> has a data length that differs from the transport data length (e.g.
> PERSISTENT RESERVE OUT might have a parameter list length in the CDB
> that's smaller than the FC_DL field), so allow these commands. The
> Windows compliance test sends them.
>
> Signed-off-by: Roland Dreier <[email protected]>
> Signed-off-by: Spencer Baugh <[email protected]>
> ---
> drivers/target/target_core_transport.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
> index ac002a7..f6626bb 100644
> --- a/drivers/target/target_core_transport.c
> +++ b/drivers/target/target_core_transport.c
> @@ -1087,9 +1087,9 @@ target_cmd_size_check(struct se_cmd *cmd, unsigned int size)
> " 0x%02x\n", cmd->se_tfo->get_fabric_name(),
> cmd->data_length, size, cmd->t_task_cdb[0]);
>
> - if (cmd->data_direction == DMA_TO_DEVICE) {
> - pr_err("Rejecting underflow/overflow"
> - " WRITE data\n");
> + if (cmd->data_direction == DMA_TO_DEVICE &&
> + cmd->se_cmd_flags & SCF_SCSI_DATA_CDB) {
> + pr_err("Rejecting underflow/overflow WRITE data\n");
> return TCM_INVALID_CDB_FIELD;
> }
> /*

Applied to target-pending/for-next.

Thanks Roland & Co.