SCSI fixes for 5.7-rc2
Subsystems (2)
James Bottomley
maintainerTwo minor fixes one to update a Kconfig reference and the other to fix an unreleased resource on an error path in sg.
The patch is available here:
git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi-fixes
The short changelog is:
Diego Elio Pettenò (1):
scsi: Update referenced link to cdrtools
Wu Bo (1):
scsi: sg: add sg_remove_request in sg_write
And the diffstat:
drivers/scsi/Kconfig | 2 +- drivers/scsi/sg.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-)
With full diff below
James
---
drivers/scsi/Kconfig +1 -1
@@ -127,7 +127,7 @@ config CHR_DEV_SG For scanners, look at SANE (<http://www.sane-project.org/>). For CD writer software look at Cdrtools - (<http://cdrecord.berlios.de/private/cdrecord.html>) + (<http://cdrtools.sourceforge.net/>) and for burning a "disk at once": CDRDAO (<http://cdrdao.sourceforge.net/>). Cdparanoia is a high quality digital reader of audio CDs (<http://www.xiph.org/paranoia/>).
drivers/scsi/sg.c +3 -1
@@ -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
The pull request you sent on Fri, 24 Apr 2020 15:22:38 -0700:
The pull request you sent on Fri, 24 Apr 2020 15:22:38 -0700:
Quoted 1 line
git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.gitscsi-fixes
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/5ef58e29078261ef5195c7fee74768546b863182
Thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.wiki.kernel.org/userdoc/prtracker