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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 D966EC54FCB for ; Fri, 24 Apr 2020 12:26:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A95C620776 for ; Fri, 24 Apr 2020 12:26:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587731182; bh=iJuRNnaanQtahYGc1fibSVMV0muGc0H2Iee6PYGiroQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=OQZsrhqp3Gb2Emz9waWT9PK6yC4FMw63pMoeIh/WC3IW/uT9aN4K0zjYaAzXLZK+A YWd4rKqQUhe1GCNwrCHBeA03Sh5OeyGAwS0/qf8olML2tgXKA5dwV31t+N5+iDqlIy qofhb5yi1uVW7bc0EC2pg5okzXas46MU/kiMB+pk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726707AbgDXM0V (ORCPT ); Fri, 24 Apr 2020 08:26:21 -0400 Received: from mail.kernel.org ([198.145.29.99]:55824 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726926AbgDXMYx (ORCPT ); Fri, 24 Apr 2020 08:24:53 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7274E20706; Fri, 24 Apr 2020 12:24:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587731093; bh=iJuRNnaanQtahYGc1fibSVMV0muGc0H2Iee6PYGiroQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PAmyaes1XNfgfnkAtn1/pd9rlJKiWc1Zk2Um0Xg1TK52oSTRTlG3ddDiELZdhhafq QRbG34wDDZ1gjb6FlJiQNr837N7rMbh3yApdG4lIj3BBQEJ3wlV+mX48sfpBx6P9rX ibU5ce+/mVefZjxgaxM9EH3kGDed5qZ5rplzmZ3M= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Li Bin , Douglas Gilbert , "Martin K . Petersen" , Sasha Levin , linux-scsi@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 05/13] scsi: sg: add sg_remove_request in sg_common_write Date: Fri, 24 Apr 2020 08:24:38 -0400 Message-Id: <20200424122447.10882-5-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200424122447.10882-1-sashal@kernel.org> References: <20200424122447.10882-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Li Bin [ Upstream commit 849f8583e955dbe3a1806e03ecacd5e71cce0a08 ] 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: Sasha Levin --- drivers/scsi/sg.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c index 8d9b416399f92..c924df5538ddc 100644 --- a/drivers/scsi/sg.c +++ b/drivers/scsi/sg.c @@ -809,8 +809,10 @@ sg_common_write(Sg_fd * sfp, Sg_request * srp, "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) { -- 2.20.1