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,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 70BC5C04AB1 for ; Thu, 9 May 2019 19:07:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3BDA420656 for ; Thu, 9 May 2019 19:07:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557428846; bh=scQnLSil0ImaITJO60dTpxacwCQbUf+OJuPDTSNB3n4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=KBGZEt+XokTqZBc1uRPDz5KNYJEd8vbieTsga1PnB0xerGribBXBex9GX7mFbMIG8 QmQx9eD9g2JViutJwaTW4xrVNLh+6IOUq/2QFa6lWKgRPvkNUaGzcxtkvk/I10eQOj X3CFTdYrxcT727+gtjcReKQZbhM/3tD0Fov1HG3M= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726754AbfEITHZ (ORCPT ); Thu, 9 May 2019 15:07:25 -0400 Received: from mail.kernel.org ([198.145.29.99]:37872 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727442AbfEISpw (ORCPT ); Thu, 9 May 2019 14:45:52 -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 15CFB21848; Thu, 9 May 2019 18:45:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557427551; bh=scQnLSil0ImaITJO60dTpxacwCQbUf+OJuPDTSNB3n4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rZnFvQ3yrB7YXehTzAl5SQTXTIqfQHdCHcs/FUE9onjbdRTsPNlzbKKsUDxIWarwH 62A0evFUcJcQFb2DyARVA4OSAstZYVdVowUMAvFA3DPOQDCQw308sMbzGKqcVNVVnw aFFaw1G1L8cTeLBq7N/p+0b6JLoU+BRSlExjPnCo= 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.14 24/42] scsi: csiostor: fix missing data copy in csio_scsi_err_handler() Date: Thu, 9 May 2019 20:42:13 +0200 Message-Id: <20190509181257.517067473@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190509181252.616018683@linuxfoundation.org> References: <20190509181252.616018683@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 dab0d3f9bee13..e09c7f360dbde 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