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=-8.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,T_DKIMWL_WL_HIGH,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 1DC4AC04AB1 for ; Thu, 9 May 2019 18:44:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E3E02217F9 for ; Thu, 9 May 2019 18:44:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557427448; bh=AGuIiNq1N365PaoQBet85r93dxgboppkAlJSeIxNGPQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=jA4PE9wwpi4byd7VNE69DJyWVfMHUGOF5gvfPg11cF7gMeocwvcQhtkaQaJkaxYoC pKK2yNji1q5txS/Y6GWVNM30rfNlggfwvBZTJ98Vsdwj8l3So21BankNXenr2Y0oTJ a1XnRslr8sfDSFnj7a2N25p0F50Evgjsx+gKBQac= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726900AbfEISoH (ORCPT ); Thu, 9 May 2019 14:44:07 -0400 Received: from mail.kernel.org ([198.145.29.99]:35238 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726620AbfEISoF (ORCPT ); Thu, 9 May 2019 14:44:05 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.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 75AA0217D6; Thu, 9 May 2019 18:44:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557427445; bh=AGuIiNq1N365PaoQBet85r93dxgboppkAlJSeIxNGPQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=D9tgNRbKxQ8lmv31PahFyI2MR8FfvBfDKHbbfrO2TnywAnW219mgt6kupd+NBSfFv EM9pd9JvfP6WdN6oh7VnbwdtU0xVnnyhjwJ/8d+kEQaiW+IfO8K2XL+KeIhYx81uoX cWX3v690Pxop9WiHodLIDZS3xT53ofzM5n8x+mb0= 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.9 13/28] scsi: csiostor: fix missing data copy in csio_scsi_err_handler() Date: Thu, 9 May 2019 20:42:05 +0200 Message-Id: <20190509181252.949744086@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190509181247.647767531@linuxfoundation.org> References: <20190509181247.647767531@linuxfoundation.org> User-Agent: quilt/0.66 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 [ Upstream commit 5c2442fd78998af60e13aba506d103f7f43f8701 ] If scsi cmd sglist is not suitable for DDP then csiostor driver uses preallocated buffers for DDP, because of this data copy is required from DDP buffer to scsi cmd sglist before calling ->scsi_done(). Signed-off-by: Varun Prakash Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/csiostor/csio_scsi.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/csiostor/csio_scsi.c b/drivers/scsi/csiostor/csio_scsi.c index 89a52b941ea8d..894d97e4ace51 100644 --- a/drivers/scsi/csiostor/csio_scsi.c +++ b/drivers/scsi/csiostor/csio_scsi.c @@ -1713,8 +1713,11 @@ csio_scsi_err_handler(struct csio_hw *hw, struct csio_ioreq *req) } out: - if (req->nsge > 0) + if (req->nsge > 0) { scsi_dma_unmap(cmnd); + if (req->dcopy && (host_status == DID_OK)) + host_status = csio_scsi_copy_to_sgl(hw, req); + } cmnd->result = (((host_status) << 16) | scsi_status); cmnd->scsi_done(cmnd); -- 2.20.1