1 files changed, 12 insertions, 7 deletions

diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.c b/drivers/infiniband/ulp/srpt/ib_srpt.c
index 6735b63d96f..c3cb907d810 100644
--- a/drivers/infiniband/ulp/srpt/ib_srpt.c
+++ b/drivers/infiniband/ulp/srpt/ib_srpt.c
@@ -1757,6 +1757,7 @@ static int srpt_handle_cmd(struct srpt_rdma_ch *ch,
                        srp_cmd->tag);
                 cmd->se_cmd_flags |= SCF_SCSI_CDB_EXCEPTION;
                 cmd->scsi_sense_reason = TCM_INVALID_CDB_FIELD;
+                kref_put(&send_ioctx->kref, srpt_put_send_ioctx_kref);
                 goto send_sense;
         }
 
@@ -1764,15 +1765,19 @@ static int srpt_handle_cmd(struct srpt_rdma_ch *ch,
         cmd->data_direction = dir;
         unpacked_lun = srpt_unpack_lun((uint8_t *)&srp_cmd->lun,
                                        sizeof(srp_cmd->lun));
-        if (transport_lookup_cmd_lun(cmd, unpacked_lun) < 0)
+        if (transport_lookup_cmd_lun(cmd, unpacked_lun) < 0) {
+                kref_put(&send_ioctx->kref, srpt_put_send_ioctx_kref);
                 goto send_sense;
+        }
         ret = transport_generic_allocate_tasks(cmd, srp_cmd->cdb);
-        if (cmd->se_cmd_flags & SCF_SCSI_RESERVATION_CONFLICT)
-                srpt_queue_status(cmd);
-        else if (cmd->se_cmd_flags & SCF_SCSI_CDB_EXCEPTION)
-                goto send_sense;
-        else
-                WARN_ON_ONCE(ret);
+        if (ret < 0) {
+                kref_put(&send_ioctx->kref, srpt_put_send_ioctx_kref);
+                if (cmd->se_cmd_flags & SCF_SCSI_RESERVATION_CONFLICT) {
+                        srpt_queue_status(cmd);
+                        return 0;
+                } else
+                        goto send_sense;
+        }
 
         transport_handle_cdb_direct(cmd);
         return 0;