From: Alok Tiwari <alok.a.tiwari@oracle.com>
Date: Sat, 28 Jun 2025 18:33:53 +0000 (-0700)
Subject: vhost-scsi: Fix check for inline_sg_cnt exceeding preallocated limit
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=400cad513c78f9af72c5a20f3611c1f1dc71d465;p=thirdparty%2Fkernel%2Flinux.git

vhost-scsi: Fix check for inline_sg_cnt exceeding preallocated limit

The condition comparing ret to VHOST_SCSI_PREALLOC_SGLS was incorrect,
as ret holds the result of kstrtouint() (typically 0 on success),
not the parsed value. Update the check to use cnt, which contains the
actual user-provided value.

prevents silently accepting values exceeding the maximum inline_sg_cnt.

Fixes: bca939d5bcd0 ("vhost-scsi: Dynamically allocate scatterlists")
Signed-off-by: Alok Tiwari <alok.a.tiwari@oracle.com>
Reviewed-by: Mike Christie <michael.christie@oracle.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20250628183405.3979538-1-alok.a.tiwari@oracle.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Jason Wang <jasowang@redhat.com>
---

diff --git a/drivers/vhost/scsi.c b/drivers/vhost/scsi.c
index fd9a517dfe13..abf51332a5c5 100644
--- a/drivers/vhost/scsi.c
+++ b/drivers/vhost/scsi.c
@@ -71,7 +71,7 @@ static int vhost_scsi_set_inline_sg_cnt(const char *buf,
 	if (ret)
 		return ret;
 
-	if (ret > VHOST_SCSI_PREALLOC_SGLS) {
+	if (cnt > VHOST_SCSI_PREALLOC_SGLS) {
 		pr_err("Max inline_sg_cnt is %u\n", VHOST_SCSI_PREALLOC_SGLS);
 		return -EINVAL;
 	}