From: Dan Carpenter Date: Sat, 9 May 2020 10:04:08 +0000 (+0300) Subject: scsi: scsi_debug: Fix an error handling bug in sdeb_zbc_model_str() X-Git-Tag: Ubuntu-5.10.0-12.13~2695^2~50 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=47742bde281b2920aae8bb82ed2d61d890aa4f56;p=mirror_ubuntu-hirsute-kernel.git scsi: scsi_debug: Fix an error handling bug in sdeb_zbc_model_str() This test is checking the wrong variable. It should be testing "res". The "sdeb_zbc_model" variable is an enum (unsigned in this situation) and we never assign negative values to it. [mkp: fixed commit desc issue reported by Doug] Link: https://lore.kernel.org/r/20200509100408.GA5555@mwanda Fixes: 9267e0eb41fe ("scsi: scsi_debug: Add ZBC module parameter") Acked-by: Douglas Gilbert Signed-off-by: Dan Carpenter Signed-off-by: Martin K. Petersen --- diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c index 105e563d87b4..73847366dc49 100644 --- a/drivers/scsi/scsi_debug.c +++ b/drivers/scsi/scsi_debug.c @@ -6460,7 +6460,7 @@ static int sdeb_zbc_model_str(const char *cp) res = sysfs_match_string(zbc_model_strs_b, cp); if (res < 0) { res = sysfs_match_string(zbc_model_strs_c, cp); - if (sdeb_zbc_model < 0) + if (res < 0) return -EINVAL; } }