scsi: sg: add sg_remove_request in sg_write
Subsystems (3)
PATCH 1/1 scsi: sg: add sg_remove_request in sg_write
From: Wu Bo <[email protected]>
[ Upstream commit 83c6f2390040f188cc25b270b4befeb5628c1aee ]
If the __copy_from_user function failed we need to call sg_remove_request in sg_write.
Acked-by Douglas Gilbert <[email protected]>
Signed-off-by Wu Bo <[email protected]>
Signed-off-by Martin K. Petersen <[email protected]>
Signed-off-by Sasha Levin <[email protected]>
[groeck: Backport to v5.4.y and older kernels]
Signed-off-by Guenter Roeck <[email protected]>
---
This patch fixes CVE-2020-12770, and the problem it fixes looks like a valid bug. Please apply to v5.4.y and older kernel branches.
drivers/scsi/sg.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/scsi/sg.c +3 -1
@@ -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
Signature · 1 line
2.17.1
Greg Kroah-Hartman
maintainerQuoted 14 lines · Guenter Roeck
From: Wu Bo <[email protected]>
[ Upstream commit
83c6f2390040f188cc25b270b4befeb5628c1aee]If the
__copy_from_userfunction failed we need to callsg_remove_requestinsg_write.Acked-by Douglas Gilbert <[email protected]>Signed-off-by Wu Bo <[email protected]>Signed-off-by Martin K. Petersen <[email protected]>Signed-off-by Sasha Levin <[email protected]>[groeck: Backport to v5.4.y and older kernels]Signed-off-by Guenter Roeck <[email protected]>
Quoted 3 lines
---
This patch fixes CVE-2020-12770, and the problem it fixes looks like a valid bug. Please apply to v5.4.y and older kernel branches.
Now queud up, thanks.
greg k-h