2020-04-15 06:52:12

by Wu Bo

Subject: [PATCH] scsi:sg: add sg_remove_request in sg_write

From: Wu Bo <[email protected]>

If the __copy_from_user function return failed,
it should call sg_remove_request in sg_write.

Signed-off-by: Wu Bo <[email protected]>
---
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

2020-04-15 14:45:16

by Martin K. Petersen

Subject: Re: [PATCH] scsi:sg: add sg_remove_request in sg_write

Wu,

> If the __copy_from_user function return failed, it should call
> sg_remove_request in sg_write.

Applied to 5.7/scsi-fixes (by hand, another mangled patch). Thanks.

--
Martin K. Petersen Oracle Linux Engineering

2020-04-15 21:51:56

by Douglas Gilbert

Subject: Re: [PATCH] scsi:sg: add sg_remove_request in sg_write

On 2020-04-13 10:13 p.m., Wu Bo wrote:
> From: Wu Bo <[email protected]>
>
> 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 <[email protected]>
> Signed-off-by: Wu Bo <[email protected]>
> ---
>  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
>