lkml.org 
[lkml]   [2016]   [Sep]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 118/192] [PATCH 122/135] HID: core: prevent out-of-bound readings
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

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

    [ Upstream commit 50220dead1650609206efe91f0cc116132d59b3f ]

    Plugging a Logitech DJ receiver with KASAN activated raises a bunch of
    out-of-bound readings.

    The fields are allocated up to MAX_USAGE, meaning that potentially, we do
    not have enough fields to fit the incoming values.
    Add checks and silence KASAN.

    Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>
    Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/hid/hid-core.c | 3 +++
    1 file changed, 3 insertions(+)

    --- a/drivers/hid/hid-core.c
    +++ b/drivers/hid/hid-core.c
    @@ -1251,6 +1251,7 @@ static void hid_input_field(struct hid_d
    /* Ignore report if ErrorRollOver */
    if (!(field->flags & HID_MAIN_ITEM_VARIABLE) &&
    value[n] >= min && value[n] <= max &&
    + value[n] - min < field->maxusage &&
    field->usage[value[n] - min].hid == HID_UP_KEYBOARD + 1)
    goto exit;
    }
    @@ -1263,11 +1264,13 @@ static void hid_input_field(struct hid_d
    }

    if (field->value[n] >= min && field->value[n] <= max
    + && field->value[n] - min < field->maxusage
    && field->usage[field->value[n] - min].hid
    && search(value, field->value[n], count))
    hid_process_event(hid, field, &field->usage[field->value[n] - min], 0, interrupt);

    if (value[n] >= min && value[n] <= max
    + && value[n] - min < field->maxusage
    && field->usage[value[n] - min].hid
    && search(field->value, value[n], count))
    hid_process_event(hid, field, &field->usage[value[n] - min], 1, interrupt);

    \
     
     \ /
      Last update: 2016-09-17 09:59    [W:4.062 / U:0.340 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site