From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from p3plsmtps2ded04.prod.phx3.secureserver.net ([208.109.80.198]:38929 "EHLO p3plsmtps2ded04.prod.phx3.secureserver.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753723AbcAGXFm (ORCPT ); Thu, 7 Jan 2016 18:05:42 -0500 From: "K. Y. Srinivasan" To: gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org, devel@linuxdriverproject.org, ohering@suse.com, jbottomley@parallels.com, hch@infradead.org, linux-scsi@vger.kernel.org, apw@canonical.com, vkuznets@redhat.com, jasowang@redhat.com, martin.petersen@oracle.com, hare@suse.de Cc: "K. Y. Srinivasan" , Subject: [PATCH 1/1] scsi: scsi_transport_fc: Fix a bug in the error handling function Date: Thu, 7 Jan 2016 16:40:45 -0800 Message-Id: <1452213645-18889-1-git-send-email-kys@microsoft.com> Sender: stable-owner@vger.kernel.org List-ID: The macro startget_to_rport() can return NULL; handle that case properly. Signed-off-by: K. Y. Srinivasan Cc: --- drivers/scsi/scsi_transport_fc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c index 24eaaf6..42a908f 100644 --- a/drivers/scsi/scsi_transport_fc.c +++ b/drivers/scsi/scsi_transport_fc.c @@ -2081,7 +2081,7 @@ fc_timed_out(struct scsi_cmnd *scmd) { struct fc_rport *rport = starget_to_rport(scsi_target(scmd->device)); - if (rport->port_state == FC_PORTSTATE_BLOCKED) + if ((rport == NULL) || (rport->port_state == FC_PORTSTATE_BLOCKED)) return BLK_EH_RESET_TIMER; return BLK_EH_NOT_HANDLED; -- 1.7.4.1