From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D4FB7C43387 for ; Thu, 20 Dec 2018 09:29:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A538220656 for ; Thu, 20 Dec 2018 09:29:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1545298174; bh=+f4Awexe6KsGPKH4JIWXeclsX3g85VG1RB6ZB8x2W3s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ws5497KymLUi9p5bLqnmkUeqqY28CF+gQoW8jgJLbvPguJiBN0xjFELluHI9vufkR JG0l3MP6gVpLRSwt3LNNJ49FJ1kSWVcQGnFTiR6TcG+LeXbWmKi9i5ZFHIJlqHC1QV rmDHXkZp9WKoQhgjz5Ovoz2FGvXwi5hxo8GlGnEE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732732AbeLTJ3d (ORCPT ); Thu, 20 Dec 2018 04:29:33 -0500 Received: from mail.kernel.org ([198.145.29.99]:56878 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732289AbeLTJ3b (ORCPT ); Thu, 20 Dec 2018 04:29:31 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1930720656; Thu, 20 Dec 2018 09:29:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1545298170; bh=+f4Awexe6KsGPKH4JIWXeclsX3g85VG1RB6ZB8x2W3s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AUmH4Cgkp9BiHuuYfSM6IpgxolemWilzWLQgSZ3FqNAX6fnkh6rqo3i1OUW9hsHBk j3dsFzs+8kQKUlMsYqnrKpQx5pnIAEWAcvfQa4bq1JrePy4vjtUCN5ZS4boLEXdS2g e8+e/tNu2jhpKfVQfzjwwgFriQ9x0peMpZkOQxe0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Fred Herard , Konrad Rzeszutek Wilk , Lee Duncan , "Martin K. Petersen" , Sasha Levin Subject: [PATCH 4.19 07/67] scsi: libiscsi: Fix NULL pointer dereference in iscsi_eh_session_reset Date: Thu, 20 Dec 2018 10:18:19 +0100 Message-Id: <20181220085903.858927113@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20181220085903.562090333@linuxfoundation.org> References: <20181220085903.562090333@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit 5db6dd14b31397e8cccaaddab2ff44ebec1acf25 ] This commit addresses NULL pointer dereference in iscsi_eh_session_reset. Reference should not be made to session->leadconn when session->state is set to ISCSI_STATE_TERMINATE. Signed-off-by: Fred Herard Reviewed-by: Konrad Rzeszutek Wilk Reviewed-by: Lee Duncan Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/libiscsi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c index 93c66ebad907..f78d2e5c1471 100644 --- a/drivers/scsi/libiscsi.c +++ b/drivers/scsi/libiscsi.c @@ -2416,8 +2416,8 @@ int iscsi_eh_session_reset(struct scsi_cmnd *sc) failed: ISCSI_DBG_EH(session, "failing session reset: Could not log back into " - "%s, %s [age %d]\n", session->targetname, - conn->persistent_address, session->age); + "%s [age %d]\n", session->targetname, + session->age); spin_unlock_bh(&session->frwd_lock); mutex_unlock(&session->eh_mutex); return FAILED; -- 2.19.1