Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
IronPort-SDR: SSnpdvgb3S51Is0/+vIW9HK/H6YyCmDiBU8W//FJI9IbYa8+pEVsjSVkHYGz5pVyFz5QHnNuWa
 rJQOTIbRpoPdmfz55Q3pZOckPeRPfkP93Ra1u6FblS9XGx0+s5yUlMy3Tm54aU64F7leFN6R3B
 y7vztXH6c8H/oPnePe1B5Koklmc53WLSbBNBDHhLIJa2m0MFulcyo5RMW9PDUeQvNkq5zhHtwq
 fl4TprEjephoY+lp/O3VCe9Lpellu/ZcYytmscFkttMGNhGO4r/yQeaVK2dfbQnlJXZKkGPxqw
 sPhi1ts+FQlbACQqcw9C0TBq
IronPort-SDR: gOHrNyTLB1Q2JcXE3fbb+uMwK4jheduZjWDMh+IhxiaaVP3yvPp9DSVUzLQxb0H9BZEAAcYeEX
 TpUyZ3G0FedEG5Cw4w1UQEZGJsUKC5jPlA4DbxKHT1RfNcCBqCjCcD2w1ZpeSBagydZsK4LjB4
 A5ScgfzOs3t3YGT8NzQ/g9EW3f9VsXG7srkIYNL1jzr20+URMa7JGT+xQqP8tlOFj3IBLGUJvi
 /juigmHhrkk4bE8KS+kB2eW1Ll6huiPR7kIB5bEfOffnidYASM96Tj7SVjBFzQpHgRt4m7A1rZ
 YlQ=
WDCIronportException: Internal
From:   Arthur Simchaev <Arthur.Simchaev@wdc.com>
To:     James@vger.kernel.org, E.J.Bottomley@vger.kernel.org,
        jejb@linux.vnet.ibm.com, Martin@vger.kernel.org,
        K.Petersen@vger.kernel.org, martin.petersen@oracle.com
Cc:     linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org,
        Bean@vger.kernel.org, Huo@vger.kernel.org, beanhuo@micron.com,
        Arthur Simchaev <Arthur.Simchaev@wdc.com>
Subject: [PATCH] scsi: ufs-bsg: Remove ufs_bsg_get_query_desc_size function
Date:   Mon, 20 Jun 2022 15:26:06 +0300
Message-Id: <1655727966-31584-1-git-send-email-Arthur.Simchaev@wdc.com>
Precedence: bulk

The bsg driver allows user space to send device management commands.
As such, it is often used by field application engineers to debug various problems,
and as a test bed for new features as well.

Let's not bound ourself to hard coded descriptor sizes, as the new
Descriptors that supports new features are not defined yet.

Signed-off-by: Arthur Simchaev <Arthur.Simchaev@wdc.com>
---
 drivers/scsi/ufs/ufs_bsg.c | 28 ++++------------------------
 1 file changed, 4 insertions(+), 24 deletions(-)

diff --git a/drivers/scsi/ufs/ufs_bsg.c b/drivers/scsi/ufs/ufs_bsg.c
index 39bf204..7c56eba 100644
--- a/drivers/scsi/ufs/ufs_bsg.c
+++ b/drivers/scsi/ufs/ufs_bsg.c
@@ -6,24 +6,6 @@
  */
 #include "ufs_bsg.h"
 
-static int ufs_bsg_get_query_desc_size(struct ufs_hba *hba, int *desc_len,
-				       struct utp_upiu_query *qr)
-{
-	int desc_size = be16_to_cpu(qr->length);
-	int desc_id = qr->idn;
-
-	if (desc_size <= 0)
-		return -EINVAL;
-
-	ufshcd_map_desc_id_to_length(hba, desc_id, desc_len);
-	if (!*desc_len)
-		return -EINVAL;
-
-	*desc_len = min_t(int, *desc_len, desc_size);
-
-	return 0;
-}
-
 static int ufs_bsg_verify_query_size(struct ufs_hba *hba,
 				     unsigned int request_len,
 				     unsigned int reply_len)
@@ -52,13 +34,11 @@ static int ufs_bsg_alloc_desc_buffer(struct ufs_hba *hba, struct bsg_job *job,
 		goto out;
 
 	qr = &bsg_request->upiu_req.qr;
-	if (ufs_bsg_get_query_desc_size(hba, desc_len, qr)) {
-		dev_err(hba->dev, "Illegal desc size\n");
-		return -EINVAL;
-	}
+	*desc_len = be16_to_cpu(qr->length);
 
-	if (*desc_len > job->request_payload.payload_len) {
-		dev_err(hba->dev, "Illegal desc size\n");
+	if (*desc_len <= 0 || *desc_len > QUERY_DESC_MAX_SIZE ||
+	    *desc_len > job->request_payload.payload_len) {
+		dev_err(hba->dev, "Illegal desc size %d\n", *desc_len);
 		return -EINVAL;
 	}
 
-- 
2.7.4