Commit 5ef58e29 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

Pull SCSI fixes from James Bottomley:
 "Two minor fixes: one to update a Kconfig reference and the other to
  fix a resource leak on an error path in sg"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: Update referenced link to cdrtools
  scsi: sg: add sg_remove_request in sg_write
parents 8e9ccd0f fa17a6dc
...@@ -127,7 +127,7 @@ config CHR_DEV_SG ...@@ -127,7 +127,7 @@ config CHR_DEV_SG
For scanners, look at SANE (<http://www.sane-project.org/>). For CD For scanners, look at SANE (<http://www.sane-project.org/>). For CD
writer software look at Cdrtools writer software look at Cdrtools
(<http://cdrecord.berlios.de/private/cdrecord.html>) (<http://cdrtools.sourceforge.net/>)
and for burning a "disk at once": CDRDAO and for burning a "disk at once": CDRDAO
(<http://cdrdao.sourceforge.net/>). Cdparanoia is a high (<http://cdrdao.sourceforge.net/>). Cdparanoia is a high
quality digital reader of audio CDs (<http://www.xiph.org/paranoia/>). quality digital reader of audio CDs (<http://www.xiph.org/paranoia/>).
......
...@@ -685,8 +685,10 @@ sg_write(struct file *filp, const char __user *buf, size_t count, loff_t * ppos) ...@@ -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->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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment