lkml.org 
[lkml]   [2019]   [Apr]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.16 073/202] scsi: bnx2fc: Fix error handling in probe()
    3.16.66-rc1 review patch.  If anyone has any objections, please let me know.

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

    From: Dan Carpenter <dan.carpenter@oracle.com>

    commit b2d3492fc591b1fb46b81d79ca1fc44cac6ae0ae upstream.

    There are two issues here. First if cmgr->hba is not set early enough then
    it leads to a NULL dereference. Second if we don't completely initialize
    cmgr->io_bdt_pool[] then we end up dereferencing uninitialized pointers.

    Fixes: 853e2bd2103a ("[SCSI] bnx2fc: Broadcom FCoE offload driver")
    Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
    Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
    [bwh: Backorted to 3.16: adjust context]
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    drivers/scsi/bnx2fc/bnx2fc_io.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/drivers/scsi/bnx2fc/bnx2fc_io.c
    +++ b/drivers/scsi/bnx2fc/bnx2fc_io.c
    @@ -271,6 +271,7 @@ struct bnx2fc_cmd_mgr *bnx2fc_cmd_mgr_al
    return NULL;
    }

    + cmgr->hba = hba;
    cmgr->free_list = kzalloc(sizeof(*cmgr->free_list) *
    arr_sz, GFP_KERNEL);
    if (!cmgr->free_list) {
    @@ -287,7 +288,6 @@ struct bnx2fc_cmd_mgr *bnx2fc_cmd_mgr_al
    goto mem_err;
    }

    - cmgr->hba = hba;
    cmgr->cmds = (struct bnx2fc_cmd **)(cmgr + 1);

    for (i = 0; i < arr_sz; i++) {
    @@ -326,7 +326,7 @@ struct bnx2fc_cmd_mgr *bnx2fc_cmd_mgr_al

    /* Allocate pool of io_bdts - one for each bnx2fc_cmd */
    mem_size = num_ios * sizeof(struct io_bdt *);
    - cmgr->io_bdt_pool = kmalloc(mem_size, GFP_KERNEL);
    + cmgr->io_bdt_pool = kzalloc(mem_size, GFP_KERNEL);
    if (!cmgr->io_bdt_pool) {
    printk(KERN_ERR PFX "failed to alloc io_bdt_pool\n");
    goto mem_err;
    \
     
     \ /
      Last update: 2019-04-27 17:20    [W:2.183 / U:0.068 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site