diff options
author | Kees Cook <keescook@chromium.org> | 2013-08-28 20:32:01 +0000 |
---|---|---|
committer | Willy Tarreau <w@1wt.eu> | 2014-05-19 07:53:29 +0200 |
commit | 69117d947845a3065062d98c46c7a7452709cc6c (patch) | |
tree | f9ef1467ed56b9073ba716f8140f60b2e20f0487 | |
parent | 36d004160cbbe860c42feb24b02905fd50621cf6 (diff) |
HID: check for NULL field when setting values
commit be67b68d52fa28b9b721c47bb42068f0c1214855 upstream
Defensively check that the field to be worked on is not NULL.
Signed-off-by: Kees Cook <keescook@chromium.org>
Cc: stable@kernel.org
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Willy Tarreau <w@1wt.eu>
-rw-r--r-- | drivers/hid/hid-core.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index e40e3c4ba802..a222cbbb4ed7 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -983,7 +983,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); |