projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7d8da6d
)
scsi: sg: add sg_remove_request in sg_write
author
Wu Bo
<wubo40@huawei.com>
Tue, 14 Apr 2020 02:13:28 +0000
(10:13 +0800)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Wed, 20 May 2020 06:20:07 +0000
(08:20 +0200)
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
patch
|
blob
|
history
diff --git
a/drivers/scsi/sg.c
b/drivers/scsi/sg.c
index
94af30f
..
9c6bf13
100644
(file)
--- a/
drivers/scsi/sg.c
+++ b/
drivers/scsi/sg.c
@@
-689,8
+689,10
@@
sg_write(struct file *filp, const char __user *buf, size_t count, loff_t * ppos)
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