diff options
| author | Tony Battersby <tonyb@cybernetics.com> | 2015-02-11 11:32:06 -0500 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2015-05-09 23:16:18 +0100 |
| commit | 1e5bf5ca07dd5cb37b491074e6050b5633bf4c5a (patch) | |
| tree | 25ffe05f617308717777cadbd04aa0dcb2a55622 /drivers/scsi | |
| parent | df01d9846cb6dc2dfa10b2e1caaa06470caf9c6a (diff) | |
| download | kernel_samsung_smdk4412-1e5bf5ca07dd5cb37b491074e6050b5633bf4c5a.zip kernel_samsung_smdk4412-1e5bf5ca07dd5cb37b491074e6050b5633bf4c5a.tar.gz kernel_samsung_smdk4412-1e5bf5ca07dd5cb37b491074e6050b5633bf4c5a.tar.bz2 | |
sg: fix read() error reporting
commit 3b524a683af8991b4eab4182b947c65f0ce1421b upstream.
Fix SCSI generic read() incorrectly returning success after detecting an
error.
Signed-off-by: Tony Battersby <tonyb@cybernetics.com>
Acked-by: Douglas Gilbert <dgilbert@interlog.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/sg.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c index 441a1c5..2d25616 100644 --- a/drivers/scsi/sg.c +++ b/drivers/scsi/sg.c @@ -498,7 +498,7 @@ static ssize_t sg_new_read(Sg_fd * sfp, char __user *buf, size_t count, Sg_request * srp) { sg_io_hdr_t *hp = &srp->header; - int err = 0; + int err = 0, err2; int len; if (count < SZ_SG_IO_HDR) { @@ -527,8 +527,8 @@ sg_new_read(Sg_fd * sfp, char __user *buf, size_t count, Sg_request * srp) goto err_out; } err_out: - err = sg_finish_rem_req(srp); - return (0 == err) ? count : err; + err2 = sg_finish_rem_req(srp); + return err ? : err2 ? : count; } static ssize_t |