diff options
author | Jiri Kosina <jkosina@suse.cz> | 2012-04-26 18:56:08 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2012-04-27 14:10:09 -0400 |
commit | b6787242f32700377d3da3b8d788ab3928bab849 (patch) | |
tree | 54428bcff5865df64980d0af4423d52b6c1dffa5 /include | |
parent | d4f0e4daf0d867f80c78ca4f9ac03a562e229e72 (diff) |
HID: hidraw: add proper error handling to raw event reporting
If kmemdup() in hidraw_report_event() fails, we are not propagating
this fact properly.
Let hidraw_report_event() and hid_report_raw_event() return an error
value to the caller.
Reported-by: Oliver Neukum <oneukum@suse.de>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/hid.h | 2 | ||||
-rw-r--r-- | include/linux/hidraw.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/hid.h b/include/linux/hid.h index 3a95da60fd3e..58b3857dc51c 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h | |||
@@ -896,7 +896,7 @@ static inline int hid_hw_power(struct hid_device *hdev, int level) | |||
896 | return hdev->ll_driver->power ? hdev->ll_driver->power(hdev, level) : 0; | 896 | return hdev->ll_driver->power ? hdev->ll_driver->power(hdev, level) : 0; |
897 | } | 897 | } |
898 | 898 | ||
899 | void hid_report_raw_event(struct hid_device *hid, int type, u8 *data, int size, | 899 | int hid_report_raw_event(struct hid_device *hid, int type, u8 *data, int size, |
900 | int interrupt); | 900 | int interrupt); |
901 | 901 | ||
902 | extern int hid_generic_init(void); | 902 | extern int hid_generic_init(void); |
diff --git a/include/linux/hidraw.h b/include/linux/hidraw.h index 4b88e697c4e9..9cdc9b67ff49 100644 --- a/include/linux/hidraw.h +++ b/include/linux/hidraw.h | |||
@@ -76,13 +76,13 @@ struct hidraw_list { | |||
76 | #ifdef CONFIG_HIDRAW | 76 | #ifdef CONFIG_HIDRAW |
77 | int hidraw_init(void); | 77 | int hidraw_init(void); |
78 | void hidraw_exit(void); | 78 | void hidraw_exit(void); |
79 | void hidraw_report_event(struct hid_device *, u8 *, int); | 79 | int hidraw_report_event(struct hid_device *, u8 *, int); |
80 | int hidraw_connect(struct hid_device *); | 80 | int hidraw_connect(struct hid_device *); |
81 | void hidraw_disconnect(struct hid_device *); | 81 | void hidraw_disconnect(struct hid_device *); |
82 | #else | 82 | #else |
83 | static inline int hidraw_init(void) { return 0; } | 83 | static inline int hidraw_init(void) { return 0; } |
84 | static inline void hidraw_exit(void) { } | 84 | static inline void hidraw_exit(void) { } |
85 | static inline void hidraw_report_event(struct hid_device *hid, u8 *data, int len) { } | 85 | static inline int hidraw_report_event(struct hid_device *hid, u8 *data, int len) { } |
86 | static inline int hidraw_connect(struct hid_device *hid) { return -1; } | 86 | static inline int hidraw_connect(struct hid_device *hid) { return -1; } |
87 | static inline void hidraw_disconnect(struct hid_device *hid) { } | 87 | static inline void hidraw_disconnect(struct hid_device *hid) { } |
88 | #endif | 88 | #endif |