]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
scsi: scsi_debug: Fix an error handling bug in sdeb_zbc_model_str()
authorDan Carpenter <dan.carpenter@oracle.com>
Sat, 9 May 2020 10:04:08 +0000 (13:04 +0300)
committerMartin K. Petersen <martin.petersen@oracle.com>
Tue, 12 May 2020 03:21:27 +0000 (23:21 -0400)
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 <dgilbert@interlog.com>
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/scsi_debug.c

index 105e563d87b4e952f2f35a62dccf39d1a94baf64..73847366dc4959fd35b0ef6f0d064235cfb4588d 100644 (file)
@@ -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;
                }
        }