projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
849f858
)
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
Martin K. Petersen
<martin.petersen@oracle.com>
Wed, 15 Apr 2020 01:15:53 +0000
(21:15 -0400)
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>
drivers/scsi/sg.c
patch
|
blob
|
history
diff --git
a/drivers/scsi/sg.c
b/drivers/scsi/sg.c
index 9c0ee192f0f9c8e9825c01b6fd91b9df96bbcd5b..20472aaaf630a4627abaa4287dbfe2a384474b49 100644
(file)
--- a/
drivers/scsi/sg.c
+++ b/
drivers/scsi/sg.c
@@
-685,8
+685,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