* [PATCH] scsi:sg: add sg_remove_request in sg_write
@ 2020-04-14 2:13 Wu Bo
2020-04-14 18:44 ` Douglas Gilbert
2020-04-15 1:18 ` Martin K. Petersen
0 siblings, 2 replies; 3+ messages in thread
From: Wu Bo @ 2020-04-14 2:13 UTC (permalink / raw)
To: Doug Gilbert, James E.J. Bottomley, Martin K. Petersen,
linux-scsi, linux-kernel, liuzhiqiang26, linfeilong
From: Wu Bo <wubo40@huawei.com>
If the __copy_from_user function return failed,
it should call sg_remove_request in sg_write.
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
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] scsi:sg: add sg_remove_request in sg_write
2020-04-14 2:13 [PATCH] scsi:sg: add sg_remove_request in sg_write Wu Bo
@ 2020-04-14 18:44 ` Douglas Gilbert
2020-04-15 1:18 ` Martin K. Petersen
1 sibling, 0 replies; 3+ messages in thread
From: Douglas Gilbert @ 2020-04-14 18:44 UTC (permalink / raw)
To: Wu Bo, James E.J. Bottomley, Martin K. Petersen, linux-scsi,
linux-kernel, liuzhiqiang26, linfeilong
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
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] scsi:sg: add sg_remove_request in sg_write
2020-04-14 2:13 [PATCH] scsi:sg: add sg_remove_request in sg_write Wu Bo
2020-04-14 18:44 ` Douglas Gilbert
@ 2020-04-15 1:18 ` Martin K. Petersen
1 sibling, 0 replies; 3+ messages in thread
From: Martin K. Petersen @ 2020-04-15 1:18 UTC (permalink / raw)
To: Wu Bo
Cc: Doug Gilbert, James E.J. Bottomley, Martin K. Petersen,
linux-scsi, linux-kernel, liuzhiqiang26, linfeilong
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-04-15 1:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-04-14 2:13 [PATCH] scsi:sg: add sg_remove_request in sg_write Wu Bo
2020-04-14 18:44 ` Douglas Gilbert
2020-04-15 1:18 ` Martin K. Petersen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox