Skip to contentSkip to conversation

scsi: myrb: reorder status check of myrb_get_rbld_progress()

PATCH New [email protected] 1 participant 1 message Aug 16, 2021

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 scsi: myrb: reorder status check of myrb_get_rbld_progress()

From: Tom Rix <[email protected]>

Static analysis reports this representative problem myrb.c:1909: warning: The left operand of '!=' is a garbage value

        if (rbld_buf.ldev_num != sdev->id ||
            ~~~~~~~~~~~~~~~~~ ^

myrb_get_rbld_progress() can return without setting rbld_buf.ldev_num. Reorder the checks in the if () statement so a failure short circuits the rbld_buf.ldev_num check.

Fixes 081ff398c56c ("scsi: myrb: Add Mylex RAID controller (block interface)")
---
 drivers/scsi/myrb.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/scsi/myrb.c +2 -2
index a4a88323e0209..132aec8e51e5b 100644
@@ -1906,8 +1906,8 @@ static ssize_t rebuild_show(struct device *dev,
 
 	status = myrb_get_rbld_progress(cb, &rbld_buf);
 
-	if (rbld_buf.ldev_num != sdev->id ||
-	    status != MYRB_STATUS_SUCCESS)
+	if (status != MYRB_STATUS_SUCCESS ||
+	    rbld_buf.ldev_num != sdev->id)
 		return snprintf(buf, 32, "not rebuilding\n");
 
 	return snprintf(buf, 32, "rebuilding block %u of %u\n",
Signature · 1 line
2.26.3