From patchwork Mon May 18 17:36:10 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: 225543 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=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 11BDEC433E0 for ; Mon, 18 May 2020 18:31:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E009520657 for ; Mon, 18 May 2020 18:31:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1589826679; bh=Y4UlRLSIyLpUT5aBrokagxXIqt7biD1IIALrz4cS8h4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=uf+tndF97rvqW7gNpLBO6bVVyYL7ayExh8OktE+6+T9QkgkN+9SDSYMTVRe8TlYNg QIw7dj3/1CBBSE+i8y5QKGu4nMqzUJ6I6FYpxHOgZA+tYNi4ZYtmphw9wC/fdAkTNv GcZXHvfvPCMJCzVqHBWDwgizILHNJwp73ocooUDM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729174AbgERSbS (ORCPT ); Mon, 18 May 2020 14:31:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:34622 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728870AbgERRjn (ORCPT ); Mon, 18 May 2020 13:39:43 -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 CEC5B20835; Mon, 18 May 2020 17:39:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1589823583; bh=Y4UlRLSIyLpUT5aBrokagxXIqt7biD1IIALrz4cS8h4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FSkZvcPx6CJl83IsSXfAOPZWI52V03VYBMNgBu/o8gIlp9nkQBSbwYMhTT1n2/+mi uD1fJROiZgLZx/4eq/mLIC3X92sLeutmnB/TF9+d2wEpZSrblUbh84zHz30bPfLUD/ jYx4kPE8+eaJD9e0wvBNYAQv61VZOJPoyQ912kFs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Douglas Gilbert , Wu Bo , "Martin K. Petersen" , Sasha Levin , Guenter Roeck Subject: [PATCH 4.4 39/86] scsi: sg: add sg_remove_request in sg_write Date: Mon, 18 May 2020 19:36:10 +0200 Message-Id: <20200518173458.327092802@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200518173450.254571947@linuxfoundation.org> References: <20200518173450.254571947@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: Wu Bo commit 83c6f2390040f188cc25b270b4befeb5628c1aee upstream. If the __copy_from_user function failed we need to call sg_remove_request in sg_write. Link: https://lore.kernel.org/r/610618d9-e983-fd56-ed0f-639428343af7@huawei.com Acked-by: Douglas Gilbert Signed-off-by: Wu Bo Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin [groeck: Backport to v5.4.y and older kernels] Signed-off-by: Guenter Roeck 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 @@ -706,8 +706,10 @@ sg_write(struct file *filp, const char _ hp->flags = input_size; /* structure abuse ... */ hp->pack_id = old_hdr.pack_id; hp->usr_ptr = NULL; - if (__copy_from_user(cmnd, buf, cmd_size)) + if (__copy_from_user(cmnd, buf, cmd_size)) { + sg_remove_request(sfp, srp); return -EFAULT; + } /* * SG_DXFER_TO_FROM_DEV is functionally equivalent to SG_DXFER_FROM_DEV, * but is is possible that the app intended SG_DXFER_TO_DEV, because there