From patchwork Wed Apr 22 09:56:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 227058 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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, 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 506E5C55185 for ; Wed, 22 Apr 2020 10:56:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2C2452076E for ; Wed, 22 Apr 2020 10:56:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587552998; bh=+PJ94ccQdJuqFuZrlOtbwsk/rV08C4OmA0oXebMTwKs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Dc3BDUTBvqxm2zk63qr2PWVovYYKZGNkoGK5liK6mFaQxFT0DY/Nfd+CwaLB6GXAl QvrMNATzxOuV1AqmxLSVKR/AJ7DG9+ww2tPQuDzgFQRydlD0N7CB2sle8kQOdlGm/Q DCxeOMS6J/q+efHJajaItzvv8QJmoFPLvYWGrDAc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729236AbgDVK4e (ORCPT ); Wed, 22 Apr 2020 06:56:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:58336 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728323AbgDVKGY (ORCPT ); Wed, 22 Apr 2020 06:06:24 -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 B125A20774; Wed, 22 Apr 2020 10:06:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587549984; bh=+PJ94ccQdJuqFuZrlOtbwsk/rV08C4OmA0oXebMTwKs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ca6nBWCOLGDIc7w16cxmqgnCT2zv6Dt2npIu3vVxs8rxSlNXEgW5jGak4MWo+vVui Yh+zTjjrlwIszPHf7dz94wYWeGNGzqi2FQ23w1XM370eKRzlDtE7JjTiMwwN+ua4Xp 0HdfD09VkQBJCC3YRIuqablb+og13WeUe2dftXbY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Douglas Gilbert , Li Bin , "Martin K. Petersen" Subject: [PATCH 4.9 086/125] scsi: sg: add sg_remove_request in sg_common_write Date: Wed, 22 Apr 2020 11:56:43 +0200 Message-Id: <20200422095046.935017908@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200422095032.909124119@linuxfoundation.org> References: <20200422095032.909124119@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Li Bin commit 849f8583e955dbe3a1806e03ecacd5e71cce0a08 upstream. If the dxfer_len is greater than 256M then the request is invalid and we need to call sg_remove_request in sg_common_write. Link: https://lore.kernel.org/r/1586777361-17339-1-git-send-email-huawei.libin@huawei.com Fixes: f930c7043663 ("scsi: sg: only check for dxfer_len greater than 256M") Acked-by: Douglas Gilbert Signed-off-by: Li Bin Signed-off-by: Martin K. Petersen Signed-off-by: Greg Kroah-Hartman --- drivers/scsi/sg.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/drivers/scsi/sg.c +++ b/drivers/scsi/sg.c @@ -809,8 +809,10 @@ sg_common_write(Sg_fd * sfp, Sg_request "sg_common_write: scsi opcode=0x%02x, cmd_size=%d\n", (int) cmnd[0], (int) hp->cmd_len)); - if (hp->dxfer_len >= SZ_256M) + if (hp->dxfer_len >= SZ_256M) { + sg_remove_request(sfp, srp); return -EINVAL; + } k = sg_start_req(srp, cmnd); if (k) {