lkml.org 
[lkml]   [2015]   [Mar]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 146/175] sg: fix read() error reporting
    Date
    From: Tony Battersby <tonyb@cybernetics.com>

    3.12-stable review patch. If anyone has any objections, please let me know.

    ===============

    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: Jiri Slaby <jslaby@suse.cz>
    ---
    drivers/scsi/sg.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
    index df5e961484e1..eb81c98386b9 100644
    --- a/drivers/scsi/sg.c
    +++ b/drivers/scsi/sg.c
    @@ -522,7 +522,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) {
    @@ -551,8 +551,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
    --
    2.3.0


    \
     
     \ /
      Last update: 2015-03-17 10:01    [W:4.111 / U:0.420 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site