lkml.org 
[lkml]   [2013]   [Nov]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.10 71/74] NTB: Add Error Handling in ntb_device_setup
    Date
    3.10-stable review patch.  If anyone has any objections, please let me know.

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

    From: Jon Mason <jon.mason@intel.com>

    commit 3b12a0d15bd1559e72ad21d9d807fd2a6706f0ab upstream.

    If an error is encountered in ntb_device_setup, it is possible that the
    spci_cmd isn't populated. Writes to the offset can result in a NULL
    pointer dereference. This issue is easily encountered by running in
    NTB-RP mode, as it currently is not supported and will generate an
    error. To get around this issue, return if an error is encountered
    prior to attempting to write to the spci_cmd offset.

    Signed-off-by: Jon Mason <jon.mason@intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/ntb/ntb_hw.c | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    --- a/drivers/ntb/ntb_hw.c
    +++ b/drivers/ntb/ntb_hw.c
    @@ -644,10 +644,13 @@ static int ntb_device_setup(struct ntb_d
    rc = -ENODEV;
    }

    + if (rc)
    + return rc;
    +
    /* Enable Bus Master and Memory Space on the secondary side */
    writew(PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER, ndev->reg_ofs.spci_cmd);

    - return rc;
    + return 0;
    }

    static void ntb_device_free(struct ntb_device *ndev)



    \
     
     \ /
      Last update: 2013-11-09 10:21    [W:2.592 / U:0.496 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site