lkml.org 
[lkml]   [2018]   [Apr]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 02/97] parisc: Fix out of array access in match_pci_device()
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

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

    From: Helge Deller <deller@gmx.de>

    commit 615b2665fd20c327b631ff1e79426775de748094 upstream.

    As found by the ubsan checker, the value of the 'index' variable can be
    out of range for the bc[] array:

    UBSAN: Undefined behaviour in arch/parisc/kernel/drivers.c:655:21
    index 6 is out of range for type 'char [6]'
    Backtrace:
    [<104fa850>] __ubsan_handle_out_of_bounds+0x68/0x80
    [<1019d83c>] check_parent+0xc0/0x170
    [<1019d91c>] descend_children+0x30/0x6c
    [<1059e164>] device_for_each_child+0x60/0x98
    [<1019cd54>] parse_tree_node+0x40/0x54
    [<1019d86c>] check_parent+0xf0/0x170
    [<1019d91c>] descend_children+0x30/0x6c
    [<1059e164>] device_for_each_child+0x60/0x98
    [<1019d938>] descend_children+0x4c/0x6c
    [<1059e164>] device_for_each_child+0x60/0x98
    [<1019cd54>] parse_tree_node+0x40/0x54
    [<1019cffc>] hwpath_to_device+0xa4/0xc4

    Signed-off-by: Helge Deller <deller@gmx.de>
    Cc: stable@vger.kernel.org
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/parisc/kernel/drivers.c | 4 ++++
    1 file changed, 4 insertions(+)

    --- a/arch/parisc/kernel/drivers.c
    +++ b/arch/parisc/kernel/drivers.c
    @@ -648,6 +648,10 @@ static int match_pci_device(struct devic
    (modpath->mod == PCI_FUNC(devfn)));
    }

    + /* index might be out of bounds for bc[] */
    + if (index >= 6)
    + return 0;
    +
    id = PCI_SLOT(pdev->devfn) | (PCI_FUNC(pdev->devfn) << 5);
    return (modpath->bc[index] == id);
    }

    \
     
     \ /
      Last update: 2018-04-22 16:48    [W:4.111 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site