lkml.org 
[lkml]   [2020]   [Sep]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 01/16] HID: core: Correctly handle ReportSize being zero
    Date
    From: Marc Zyngier <maz@kernel.org>

    commit bce1305c0ece3dc549663605e567655dd701752c upstream.

    It appears that a ReportSize value of zero is legal, even if a bit
    non-sensical. Most of the HID code seems to handle that gracefully,
    except when computing the total size in bytes. When fed as input to
    memset, this leads to some funky outcomes.

    Detect the corner case and correctly compute the size.

    Cc: stable@vger.kernel.org
    Signed-off-by: Marc Zyngier <maz@kernel.org>
    Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/hid/hid-core.c | 15 +++++++++++++--
    1 file changed, 13 insertions(+), 2 deletions(-)

    --- a/drivers/hid/hid-core.c
    +++ b/drivers/hid/hid-core.c
    @@ -1598,6 +1598,17 @@ static void hid_output_field(const struc
    }

    /*
    + * Compute the size of a report.
    + */
    +static size_t hid_compute_report_size(struct hid_report *report)
    +{
    + if (report->size)
    + return ((report->size - 1) >> 3) + 1;
    +
    + return 0;
    +}
    +
    +/*
    * Create a report. 'data' has to be allocated using
    * hid_alloc_report_buf() so that it has proper size.
    */
    @@ -1609,7 +1620,7 @@ void hid_output_report(struct hid_report
    if (report->id > 0)
    *data++ = report->id;

    - memset(data, 0, ((report->size - 1) >> 3) + 1);
    + memset(data, 0, hid_compute_report_size(report));
    for (n = 0; n < report->maxfield; n++)
    hid_output_field(report->device, report->field[n], data);
    }
    @@ -1739,7 +1750,7 @@ int hid_report_raw_event(struct hid_devi
    csize--;
    }

    - rsize = ((report->size - 1) >> 3) + 1;
    + rsize = hid_compute_report_size(report);

    if (report_enum->numbered && rsize >= HID_MAX_BUFFER_SIZE)
    rsize = HID_MAX_BUFFER_SIZE - 1;

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