From mboxrd@z Thu Jan 1 00:00:00 1970 From: Douglas Gilbert Subject: Re: [scsi 1/2 V2] scsi_debug: schedule_resp fix input variable check Date: Mon, 23 Feb 2015 13:26:18 -0500 Message-ID: <54EB70CA.5090205@interlog.com> References: <1424704728-16445-1-git-send-email-tomas.winkler@intel.com> Reply-To: dgilbert@interlog.com Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Return-path: Received: from smtp.infotech.no ([82.134.31.41]:51911 "EHLO smtp.infotech.no" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751898AbbBWS0f (ORCPT ); Mon, 23 Feb 2015 13:26:35 -0500 In-Reply-To: <1424704728-16445-1-git-send-email-tomas.winkler@intel.com> Sender: linux-scsi-owner@vger.kernel.org List-Id: linux-scsi@vger.kernel.org To: Tomas Winkler , "James E.J. Bottomley\"" Cc: linux-scsi@vger.kernel.org On 15-02-23 10:18 AM, Tomas Winkler wrote: > 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' > > Cc: Douglas Gilbert > Signed-off-by: Tomas Winkler Acked-by: Douglas Gilbert > --- > V2: 1. Actually drop struct scsi_device *sdp = cmnd->device; > 2. fix typo in comment > drivers/scsi/scsi_debug.c | 13 ++++++++++--- > 1 file changed, 10 insertions(+), 3 deletions(-) > > diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c > index ccbe1282e975..6dda38ca83ee 100644 > --- a/drivers/scsi/scsi_debug.c > +++ b/drivers/scsi/scsi_debug.c > @@ -3945,13 +3945,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); >