scsi: sg: add sg_remove_request in sg_write
commit 83c6f23900
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>
5.4-rM2-2.2.x-imx-squashed
parent
7d8da6d7d9
commit
2d6d0ce4de
|
@ -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->flags = input_size; /* structure abuse ... */
|
||||||
hp->pack_id = old_hdr.pack_id;
|
hp->pack_id = old_hdr.pack_id;
|
||||||
hp->usr_ptr = NULL;
|
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;
|
return -EFAULT;
|
||||||
|
}
|
||||||
/*
|
/*
|
||||||
* SG_DXFER_TO_FROM_DEV is functionally equivalent to SG_DXFER_FROM_DEV,
|
* 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
|
* but is is possible that the app intended SG_DXFER_TO_DEV, because there
|
||||||
|
|
Loading…
Reference in New Issue