Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Reply-To: dgilbert@interlog.com
Subject: Re: [PATCH] scsi:sg: add sg_remove_request in sg_write
To:     Wu Bo <wubo40@huawei.com>,
        "James E.J. Bottomley" <jejb@linux.ibm.com>,
        "Martin K. Petersen" <martin.petersen@oracle.com>,
        linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org,
        liuzhiqiang26@huawei.com, linfeilong@huawei.com
References: <610618d9-e983-fd56-ed0f-639428343af7@huawei.com>
From:   Douglas Gilbert <dgilbert@interlog.com>
Message-ID: <4ece8e46-f9e4-e582-157a-7ab0268c04aa@interlog.com>
Date:   Tue, 14 Apr 2020 14:44:51 -0400
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101
 Thunderbird/68.4.1
MIME-Version: 1.0
In-Reply-To: <610618d9-e983-fd56-ed0f-639428343af7@huawei.com>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Language: en-CA
Content-Transfer-Encoding: 8bit
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On 2020-04-13 10:13 p.m., Wu Bo wrote:
> From: Wu Bo <wubo40@huawei.com>
> 
> If the __copy_from_user function return failed,
> it should call sg_remove_request in sg_write.

This is a fix.

Acked-by: Douglas Gilbert <dgilbert@interlog.com>
> Signed-off-by: Wu Bo <wubo40@huawei.com>
> ---
>   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 4e6af59..ff3f532 100644
> --- a/drivers/scsi/sg.c
> +++ b/drivers/scsi/sg.c
> @@ -685,8 +685,10 @@ static int get_sg_io_pack_id(int *pack_id, void __user 
> *buf, size_t count)
>          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
> -- 
> 1.8.3.1
>