lkml.org 
[lkml]   [2020]   [May]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 054/114] scsi: sg: add sg_remove_request in sg_write
    Date
    From: Wu Bo <wubo40@huawei.com>

    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 <dgilbert@interlog.com>
    Signed-off-by: Wu Bo <wubo40@huawei.com>
    Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    [groeck: Backport to v5.4.y and older kernels]
    Signed-off-by: Guenter Roeck <linux@roeck-us.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/scsi/sg.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    --- a/drivers/scsi/sg.c
    +++ b/drivers/scsi/sg.c
    @@ -695,8 +695,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

    \
     
     \ /
      Last update: 2020-05-18 19:47    [W:3.703 / U:0.364 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site