diff options
author | Tony Battersby <tonyb@cybernetics.com> | 2015-02-11 11:32:06 -0500 |
---|---|---|
committer | James Bottomley <JBottomley@Parallels.com> | 2015-02-15 13:36:55 -0500 |
commit | 3b524a683af8991b4eab4182b947c65f0ce1421b (patch) | |
tree | 3a91b1a2f2c3b192a8f4b1c806a896c33404d810 | |
parent | 2ecf8e0ae28cb22d434e628c351c6193fd75fafa (diff) |
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>
Acked-by: Douglas Gilbert <dgilbert@interlog.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
-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 a668c88ea150..6ad1480e87b7 100644 --- a/drivers/scsi/sg.c +++ b/drivers/scsi/sg.c | |||
@@ -546,7 +546,7 @@ static ssize_t | |||
546 | sg_new_read(Sg_fd * sfp, char __user *buf, size_t count, Sg_request * srp) | 546 | sg_new_read(Sg_fd * sfp, char __user *buf, size_t count, Sg_request * srp) |
547 | { | 547 | { |
548 | sg_io_hdr_t *hp = &srp->header; | 548 | sg_io_hdr_t *hp = &srp->header; |
549 | int err = 0; | 549 | int err = 0, err2; |
550 | int len; | 550 | int len; |
551 | 551 | ||
552 | if (count < SZ_SG_IO_HDR) { | 552 | if (count < SZ_SG_IO_HDR) { |
@@ -575,8 +575,8 @@ sg_new_read(Sg_fd * sfp, char __user *buf, size_t count, Sg_request * srp) | |||
575 | goto err_out; | 575 | goto err_out; |
576 | } | 576 | } |
577 | err_out: | 577 | err_out: |
578 | err = sg_finish_rem_req(srp); | 578 | err2 = sg_finish_rem_req(srp); |
579 | return (0 == err) ? count : err; | 579 | return err ? : err2 ? : count; |
580 | } | 580 | } |
581 | 581 | ||
582 | static ssize_t | 582 | static ssize_t |