diff options
| author | Wu Bo <wubo40@huawei.com> | 2020-04-14 10:13:28 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-05-20 08:18:34 +0200 |
| commit | 34fcb4291e234468f9bf9d4b851c9f522f3bbb13 (patch) | |
| tree | 7e231488065cceddf7a4bc3b148803e6fa025f8e /drivers/scsi/sg.c | |
| parent | 3c11fec8151972c93fba530fcdd752a40f794296 (diff) | |
| download | linux-stable-34fcb4291e234468f9bf9d4b851c9f522f3bbb13.tar.gz linux-stable-34fcb4291e234468f9bf9d4b851c9f522f3bbb13.tar.bz2 linux-stable-34fcb4291e234468f9bf9d4b851c9f522f3bbb13.zip | |
scsi: sg: add sg_remove_request in sg_write
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>
Diffstat (limited to 'drivers/scsi/sg.c')
| -rw-r--r-- | drivers/scsi/sg.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c index ac8535d2b41a..6bb45ae19d58 100644 --- a/drivers/scsi/sg.c +++ b/drivers/scsi/sg.c @@ -694,8 +694,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 |