lkml.org 
[lkml]   [2014]   [Oct]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.16 238/357] SCSI: libiscsi: fix potential buffer overrun in __iscsi_conn_send_pdu
    Date
    3.16-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Mike Christie <michaelc@cs.wisc.edu>

    commit db9bfd64b14a3a8f1868d2164518fdeab1b26ad1 upstream.

    This patches fixes a potential buffer overrun in __iscsi_conn_send_pdu.
    This function is used by iscsi drivers and userspace to send iscsi PDUs/
    commands. For login commands, we have a set buffer size. For all other
    commands we do not support data buffers.

    This was reported by Dan Carpenter here:
    http://www.spinics.net/lists/linux-scsi/msg66838.html

    Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
    Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
    Reviewed-by: Sagi Grimberg <sagig@mellanox.com>
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Signed-off-by: James Bottomley <JBottomley@Parallels.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/scsi/libiscsi.c | 10 ++++++++++
    1 file changed, 10 insertions(+)

    --- a/drivers/scsi/libiscsi.c
    +++ b/drivers/scsi/libiscsi.c
    @@ -717,11 +717,21 @@ __iscsi_conn_send_pdu(struct iscsi_conn
    return NULL;
    }

    + if (data_size > ISCSI_DEF_MAX_RECV_SEG_LEN) {
    + iscsi_conn_printk(KERN_ERR, conn, "Invalid buffer len of %u for login task. Max len is %u\n", data_size, ISCSI_DEF_MAX_RECV_SEG_LEN);
    + return NULL;
    + }
    +
    task = conn->login_task;
    } else {
    if (session->state != ISCSI_STATE_LOGGED_IN)
    return NULL;

    + if (data_size != 0) {
    + iscsi_conn_printk(KERN_ERR, conn, "Can not send data buffer of len %u for op 0x%x\n", data_size, opcode);
    + return NULL;
    + }
    +
    BUG_ON(conn->c_stage == ISCSI_CONN_INITIAL_STAGE);
    BUG_ON(conn->c_stage == ISCSI_CONN_STOPPED);




    \
     
     \ /
      Last update: 2014-10-04 00:21    [W:2.184 / U:0.240 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site