Received: by 2002:ac0:a5a6:0:0:0:0:0 with SMTP id m35-v6csp1806320imm; Mon, 3 Sep 2018 09:56:10 -0700 (PDT) X-Google-Smtp-Source: ANB0Vda9UTuYGd428JTR6cNQNC/rdlv5dRHW5Xd8Jnc+vyUq9/Mn/b1h2J20Valdqo/sCgnUVLhp X-Received: by 2002:a63:e14a:: with SMTP id h10-v6mr27069368pgk.358.1535993770560; Mon, 03 Sep 2018 09:56:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535993770; cv=none; d=google.com; s=arc-20160816; b=WNfWeoHFFnczzWAMAXDy3vEXV9VLXigWQHFVLVJCVxgQgf/WgKKZiAmGcT1wuO2bEB Ze/isfIMrJro4haIvCHCaNGV5/v/A6y8aTc/7VyTg+rcxFaoVLu8se3qfYf8FZGozwih XECINnzp1YgnI8prz16JFqL6gM3aUhtnX3BXhcb51UU5ghvCvL+egALRfGkmEXVYK/gt nfvX8h2qDyWtLiz0dsy1WRiv3DSfxGbHcXvPyQa48wfWHdhX3HD0lkYFoWzEK4p5LmuL 5yL9KB0Sa2cmLp/4db+JdzuyUqMlNefTTrTDQNc3XB1Mlsp9lvvbYo/bVtHmcbDinQu4 819w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=2qzgyMWaqq5tyAwAjECXhpl+XnIK3ovURxreTRL1QrY=; b=e10R3DK2LGUZPDvXinMn9s/Ng4w/o6qyBjLtGu6z7N9W74mtmqdSlkqc+tkBBIq+qG YsFWz70BDGuy5h3LqjTQ2TKXS/7q5ubA5soNH5AnkMuU0lE1vXgSq+dbH120Mn/YwQaO EdA9pP/tXJfsW7ctVu3TI1TEk5rVKYvSOHMf6d1CJyDIEit3TXx9pUTr583WCsRoEG+n aTSaxxO+YexWtALEkMZyevMftA3Sp7BP2HNuRzdTykwcgFw2mB0gtUTEDxhzFCJj9+Ac PGtbu5EWY+cc96HFC9ZSt/TgvNemAes1PC0N5eDMl1B/zUalYJ80hsB+KHzNxMUdGg9L +9HA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s29-v6si17738772pgn.47.2018.09.03.09.55.56; Mon, 03 Sep 2018 09:56:10 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728962AbeICVPE (ORCPT + 99 others); Mon, 3 Sep 2018 17:15:04 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:38270 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728398AbeICVPD (ORCPT ); Mon, 3 Sep 2018 17:15:03 -0400 Received: from localhost (ip-213-127-74-90.ip.prioritytelecom.net [213.127.74.90]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 0D0BCCF5; Mon, 3 Sep 2018 16:54:05 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Varun Prakash , "Martin K. Petersen" , Sasha Levin Subject: [PATCH 4.4 09/80] scsi: libiscsi: fix possible NULL pointer dereference in case of TMF Date: Mon, 3 Sep 2018 18:48:47 +0200 Message-Id: <20180903164934.534035334@linuxfoundation.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180903164934.171677301@linuxfoundation.org> References: <20180903164934.171677301@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Varun Prakash [ Upstream commit a17037e7d59075053b522048742a08ac9500bde8 ] In iscsi_check_tmf_restrictions() task->hdr is dereferenced to print the opcode, it is possible that task->hdr is NULL. There are two cases based on opcode argument: 1. ISCSI_OP_SCSI_CMD - In this case alloc_pdu() is called after iscsi_check_tmf_restrictions() iscsi_prep_scsi_cmd_pdu() -> iscsi_check_tmf_restrictions() -> alloc_pdu(). Transport drivers allocate memory for iSCSI hdr in alloc_pdu() and assign it to task->hdr. In case of TMF task->hdr will be NULL resulting in NULL pointer dereference. 2. ISCSI_OP_SCSI_DATA_OUT - In this case transport driver can free the memory for iSCSI hdr after transmitting the pdu so task->hdr can be NULL or invalid. This patch fixes this issue by removing task->hdr->opcode from the printk statement. Signed-off-by: Varun Prakash Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/scsi/libiscsi.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) --- a/drivers/scsi/libiscsi.c +++ b/drivers/scsi/libiscsi.c @@ -283,11 +283,11 @@ static int iscsi_check_tmf_restrictions( */ if (opcode != ISCSI_OP_SCSI_DATA_OUT) { iscsi_conn_printk(KERN_INFO, conn, - "task [op %x/%x itt " + "task [op %x itt " "0x%x/0x%x] " "rejected.\n", - task->hdr->opcode, opcode, - task->itt, task->hdr_itt); + opcode, task->itt, + task->hdr_itt); return -EACCES; } /* @@ -296,10 +296,10 @@ static int iscsi_check_tmf_restrictions( */ if (conn->session->fast_abort) { iscsi_conn_printk(KERN_INFO, conn, - "task [op %x/%x itt " + "task [op %x itt " "0x%x/0x%x] fast abort.\n", - task->hdr->opcode, opcode, - task->itt, task->hdr_itt); + opcode, task->itt, + task->hdr_itt); return -EACCES; } break;