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=-19.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 EF017C4167B for ; Fri, 10 Sep 2021 01:05:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D78A061213 for ; Fri, 10 Sep 2021 01:05:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343554AbhIJBFQ (ORCPT ); Thu, 9 Sep 2021 21:05:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:50000 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234873AbhIJAY6 (ORCPT ); Thu, 9 Sep 2021 20:24:58 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id AEBBB611BD; Fri, 10 Sep 2021 00:23:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631233428; bh=wgtteItbgVKmHslZMv8LiZ9CuPo7kmoAhXEiSvAgCJ4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mYiH/TGIn0eLGMqoBdyVNvSM0IuzmBqPLbqnRelxTHv/6Gmdjx+5/lIW2ufKu6l4r MgY/TYdXEXNcFp/vlIJDKOGAWLnx9N2SUsvzcVSzCy6HExn7XIypwYhGUc83UL5+9z CRxuia0vLTbn8gkV27dw3xRMW9FRAfQsnmP/pQ6fJCtoy7dLcgP8JTnZWgtelxUnue 3Uhp6f/3XoVcW6x3CBAzpyKNGEBVUm8xaEYtcpD5rsevx4/bOrK01DVztL6OnJU6CH y+HbiAMaTMqFYuy0C/zN1ZwGC2T/c1w2yQCpEn3wsnAhRwVRmx6zmnEgQh5ToaTqN3 ShtAHKZGE+QVg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Tuo Li , TOTE Robot , Bodo Stroesser , "Martin K . Petersen" , Sasha Levin , linux-scsi@vger.kernel.org, target-devel@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 07/17] scsi: target: pscsi: Fix possible null-pointer dereference in pscsi_complete_cmd() Date: Thu, 9 Sep 2021 20:23:28 -0400 Message-Id: <20210910002338.176677-7-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210910002338.176677-1-sashal@kernel.org> References: <20210910002338.176677-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Tuo Li [ Upstream commit 0f99792c01d1d6d35b86e850e9ccadd98d6f3e0c ] The return value of transport_kmap_data_sg() is assigned to the variable buf: buf = transport_kmap_data_sg(cmd); And then it is checked: if (!buf) { This indicates that buf can be NULL. However, it is dereferenced in the following statements: if (!(buf[3] & 0x80)) buf[3] |= 0x80; if (!(buf[2] & 0x80)) buf[2] |= 0x80; To fix these possible null-pointer dereferences, dereference buf and call transport_kunmap_data_sg() only when buf is not NULL. Link: https://lore.kernel.org/r/20210810040414.248167-1-islituo@gmail.com Reported-by: TOTE Robot Reviewed-by: Bodo Stroesser Signed-off-by: Tuo Li Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/target/target_core_pscsi.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/target/target_core_pscsi.c b/drivers/target/target_core_pscsi.c index 089ba39f76a2..c7b934f601af 100644 --- a/drivers/target/target_core_pscsi.c +++ b/drivers/target/target_core_pscsi.c @@ -631,17 +631,17 @@ static void pscsi_transport_complete(struct se_cmd *cmd, struct scatterlist *sg, buf = transport_kmap_data_sg(cmd); if (!buf) { ; /* XXX: TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE */ - } - - if (cdb[0] == MODE_SENSE_10) { - if (!(buf[3] & 0x80)) - buf[3] |= 0x80; } else { - if (!(buf[2] & 0x80)) - buf[2] |= 0x80; - } + if (cdb[0] == MODE_SENSE_10) { + if (!(buf[3] & 0x80)) + buf[3] |= 0x80; + } else { + if (!(buf[2] & 0x80)) + buf[2] |= 0x80; + } - transport_kunmap_data_sg(cmd); + transport_kunmap_data_sg(cmd); + } } } after_mode_sense: -- 2.30.2