]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
scsi_debug: schedule_resp fix input variable check
authorTomas Winkler <tomas.winkler@intel.com>
Tue, 28 Jul 2015 13:54:24 +0000 (16:54 +0300)
committerJames Bottomley <JBottomley@Odin.com>
Sun, 6 Sep 2015 18:02:04 +0000 (11:02 -0700)
The function should never be called with cmnd NULL so
put a fat WARN there.
Fix also smatch wraning:
schedule_resp() warn: variable dereferenced before check 'cmnd'

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Acked-by: Douglas Gilbert <dgilbert@interlog.com>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: James Bottomley <JBottomley@Odin.com>
drivers/scsi/scsi_debug.c

index 3a70683cf9f9015a58f9ff712311c009ba5e3943..faa4ddd8decfb84f8813a8f5ad3cf329b034e16a 100644 (file)
@@ -3941,13 +3941,20 @@ schedule_resp(struct scsi_cmnd *cmnd, struct sdebug_dev_info *devip,
        unsigned long iflags;
        int k, num_in_q, qdepth, inject;
        struct sdebug_queued_cmd *sqcp = NULL;
-       struct scsi_device *sdp = cmnd->device;
+       struct scsi_device *sdp;
+
+       /* this should never happen */
+       if (WARN_ON(!cmnd))
+               return SCSI_MLQUEUE_HOST_BUSY;
 
-       if (NULL == cmnd || NULL == devip) {
-               pr_warn("called with NULL cmnd or devip pointer\n");
+       if (NULL == devip) {
+               pr_warn("called devip == NULL\n");
                /* no particularly good error to report back */
                return SCSI_MLQUEUE_HOST_BUSY;
        }
+
+       sdp = cmnd->device;
+
        if ((scsi_result) && (SCSI_DEBUG_OPT_NOISE & scsi_debug_opts))
                sdev_printk(KERN_INFO, sdp, "%s: non-zero result=0x%x\n",
                            __func__, scsi_result);