Messages in this thread Patch in this message | | | Date | Wed, 11 Feb 2015 11:32:06 -0500 | From | Tony Battersby <> | Subject | [PATCH] [SCSI] sg: fix read() error reporting |
| |
Fix SCSI generic read() incorrectly returning success after detecting an error.
Cc: <stable@vger.kernel.org> Signed-off-by: Tony Battersby <tonyb@cybernetics.com> ---
For inclusion in kernel 3.20.
--- linux-3.19.0/drivers/scsi/sg.c.orig 2015-02-08 21:54:22.000000000 -0500 +++ linux-3.19.0/drivers/scsi/sg.c 2015-02-10 09:26:09.000000000 -0500 @@ -546,7 +546,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) { @@ -575,8 +575,8 @@ sg_new_read(Sg_fd * sfp, char __user *bu 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
| |