diff mbox

target: allow underflow/overflow for PR OUT etc. commands

Message ID 1437602898-15229-4-git-send-email-sbaugh@catern.com (mailing list archive)
State New, archived
Headers show

Commit Message

Spencer Baugh July 22, 2015, 10:08 p.m. UTC 
From: Roland Dreier <roland@purestorage.com>

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 <roland@purestorage.com>
Signed-off-by: Spencer Baugh <sbaugh@catern.com>
---
 drivers/target/target_core_transport.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Christoph Hellwig July 23, 2015, 9:44 a.m. UTC | #1 
Looks good,

Reviewed-by: Christoph Hellwig <hch@lst.de>

(altough normal Linux style would be to add parenthesis around the
logial and)
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Nicholas A. Bellinger July 31, 2015, 6:44 a.m. UTC | #2 
On Wed, 2015-07-22 at 15:08 -0700, Spencer Baugh wrote:
> From: Roland Dreier <roland@purestorage.com>
> 
> 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 <roland@purestorage.com>
> Signed-off-by: Spencer Baugh <sbaugh@catern.com>
> ---
>  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.

--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

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;
 		}
 		/*