lkml.org 
[lkml]   [2014]   [Oct]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.13 056/163] xhci: Fix null pointer dereference if xhci initialization fails
    Date
    3.13.11.9 -stable review patch.  If anyone has any objections, please let me know.

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

    From: Mathias Nyman <mathias.nyman@linux.intel.com>

    commit c207e7c50f31113c24a9f536fcab1e8a256985d7 upstream.

    If xhci initialization fails before the roothub bandwidth
    domains (xhci->rh_bw[i]) are allocated it will oops when
    trying to access rh_bw members in xhci_mem_cleanup().

    Reported-by: Manuel Reimer <manuel.reimer@gmx.de>
    Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    drivers/usb/host/xhci-mem.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c
    index 4483e6a..837c333 100644
    --- a/drivers/usb/host/xhci-mem.c
    +++ b/drivers/usb/host/xhci-mem.c
    @@ -1723,7 +1723,7 @@ void xhci_mem_cleanup(struct xhci_hcd *xhci)
    }

    num_ports = HCS_MAX_PORTS(xhci->hcs_params1);
    - for (i = 0; i < num_ports; i++) {
    + for (i = 0; i < num_ports && xhci->rh_bw; i++) {
    struct xhci_interval_bw_table *bwt = &xhci->rh_bw[i].bw_table;
    for (j = 0; j < XHCI_MAX_INTERVAL; j++) {
    struct list_head *ep = &bwt->interval_bw[j].endpoints;
    --
    1.9.1


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