[PATCH 2/4] target/user: Return an error if cmd data size is too large

[Tim Gardner]

From: Andy Grover <agrover at redhat.com>

BugLink: http://bugs.launchpad.net/bugs/1646204

Userspace should be implementing VPD B0 (Block Limits) to inform the
initiator of max data size, but just in case we do get a too-large request,
do what the spec says and return INVALID_CDB_FIELD.

Make sure to unlock udev->cmdr_lock before returning.

Signed-off-by: Andy Grover <agrover at redhat.com>
Reviewed-by: Christoph Hellwig <hch at lst.de>
Reviewed-by: Mike Christie <mchristi at redhat.com>
Signed-off-by: Nicholas Bellinger <nab at linux-iscsi.org>
(back ported from linux-next commit 554617b2bbe25c3fb3c80c28fe7a465884bb40b1)
Signed-off-by: Tim Gardner <tim.gardner at canonical.com>

Conflicts:
	drivers/target/target_core_user.c
---
 drivers/target/target_core_user.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/target/target_core_user.c b/drivers/target/target_core_user.c
index 28debdf..bedd379 100644
--- a/drivers/target/target_core_user.c
+++ b/drivers/target/target_core_user.c
@@ -418,10 +418,13 @@ tcmu_queue_cmd_ring(struct tcmu_cmd *tcmu_cmd)
 	mb = udev->mb_addr;
 	cmd_head = mb->cmd_head % udev->cmdr_size; /* UAM */
 	if ((command_size > (udev->cmdr_size / 2))
-	    || tcmu_cmd->data_length > (udev->data_size - 1))
+	    || tcmu_cmd->data_length > (udev->data_size - 1)) {
 		pr_warn("TCMU: Request of size %zu/%zu may be too big for %u/%zu "
 			"cmd/data ring buffers\n", command_size, tcmu_cmd->data_length,
 			udev->cmdr_size, udev->data_size);
+		spin_unlock_irq(&udev->cmdr_lock);
+		return TCM_INVALID_CDB_FIELD;
+	}
 
 	while (!is_ring_space_avail(udev, command_size, tcmu_cmd->data_length)) {
 		int ret;
-- 
2.7.4