lkml.org 
[lkml]   [2013]   [Sep]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 087/104] HID: check for NULL field when setting values
    Date
    3.5.7.22 -stable review patch.  If anyone has any objections, please let me know.

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

    From: Kees Cook <keescook@chromium.org>

    commit be67b68d52fa28b9b721c47bb42068f0c1214855 upstream.

    Defensively check that the field to be worked on is not NULL.

    Signed-off-by: Kees Cook <keescook@chromium.org>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    drivers/hid/hid-core.c | 7 ++++++-
    1 file changed, 6 insertions(+), 1 deletion(-)

    diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
    index 104792d..0d76d3f 100644
    --- a/drivers/hid/hid-core.c
    +++ b/drivers/hid/hid-core.c
    @@ -1133,7 +1133,12 @@ EXPORT_SYMBOL_GPL(hid_output_report);

    int hid_set_field(struct hid_field *field, unsigned offset, __s32 value)
    {
    - unsigned size = field->report_size;
    + unsigned size;
    +
    + if (!field)
    + return -1;
    +
    + size = field->report_size;

    hid_dump_input(field->report->device, field->usage + offset, value);

    --
    1.8.3.2


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