HID: hid-input: allow input_configured callback return errors
Subsystems (4)
PATCH 1/1 HID: hid-input: allow input_configured callback return errors
When configuring input device via input_configured callback we may encounter errors (for example input_mt_init_slots() may fail). Instead of continuing with half-initialized input device let's allow driver indicate failures.
--- drivers/hid/hid-appleir.c | 4 +++- drivers/hid/hid-elo.c | 4 +++- drivers/hid/hid-input.c | 10 ++++++---- drivers/hid/hid-lenovo.c | 4 +++- drivers/hid/hid-logitech-hidpp.c | 4 +++- drivers/hid/hid-magicmouse.c | 8 ++++++-- drivers/hid/hid-multitouch.c | 19 ++++++++++++++----- drivers/hid/hid-ntrig.c | 6 ++++-- drivers/hid/hid-rmi.c | 11 +++++++---- drivers/hid/hid-sony.c | 13 ++++++++++--- drivers/hid/hid-uclogic.c | 6 ++++-- include/linux/hid.h | 4 ++-- 12 files changed, 65 insertions(+), 28 deletions(-)
drivers/hid/hid-appleir.c +3 -1
@@ -256,7 +256,7 @@ out:return 0 ; } -static void appleir_input_configured (struct hid_device *hid, +static int appleir_input_configured (struct hid_device *hid,struct hid_input *hidinput) {struct input_dev *input_dev = hidinput->input;
@@ -275,6 +275,8 @@ static void appleir_input_configured(struct hid_device *hid,for (i =0 ; i <ARRAY_SIZE (appleir_key_table); i++)set_bit (appleir->keymap[i], input_dev->keybit);clear_bit (KEY_RESERVED , input_dev->keybit); + +return 0 ; } static int appleir_input_mapping(struct hid_device *hid,
drivers/hid/hid-elo.c +3 -1
@@ -37,7 +37,7 @@ static bool use_fw_quirk = true;module_param (use_fw_quirk, bool,S_IRUGO );MODULE_PARM_DESC (use_fw_quirk,"Do periodic pokes for broken M firmwares (default = true)" ); -static void elo_input_configured (struct hid_device *hdev, +static int elo_input_configured (struct hid_device *hdev,struct hid_input *hidinput) {struct input_dev *input = hidinput->input;
@@ -45,6 +45,8 @@ static void elo_input_configured(struct hid_device *hdev,set_bit (BTN_TOUCH , input->keybit);set_bit (ABS_PRESSURE , input->absbit);input_set_abs_params (input,ABS_PRESSURE ,0 ,256 ,0 ,0 ); + +return 0 ; }static void elo_process_data (struct input_dev *input,const u8 *data,int size)
drivers/hid/hid-input.c +6 -4
@@ -1510,8 +1510,9 @@ int hidinput_connect(struct hid_device *hid, unsigned int force)* UGCI) cram a lot of unrelated inputs into the * same interface. */ hidinput->report = report; -if (drv->input_configured) - drv->input_configured (hid, hidinput); +if (drv->input_configured && + drv->input_configured (hid, hidinput)) + goto out_cleanup;if (input_register_device (hidinput->input)) goto out_cleanup; hidinput =NULL ;
@@ -1532,8 +1533,9 @@ int hidinput_connect(struct hid_device *hid, unsigned int force) }if (hidinput) { -if (drv->input_configured) - drv->input_configured (hid, hidinput); +if (drv->input_configured && + drv->input_configured (hid, hidinput)) + goto out_cleanup;if (input_register_device (hidinput->input)) goto out_cleanup; }
drivers/hid/hid-lenovo.c +3 -1
@@ -848,7 +848,7 @@ static void lenovo_remove(struct hid_device *hdev)hid_hw_stop (hdev); } -static void lenovo_input_configured (struct hid_device *hdev, +static int lenovo_input_configured (struct hid_device *hdev,struct hid_input *hi) {switch (hdev->product) {
@@ -863,6 +863,8 @@ static void lenovo_input_configured(struct hid_device *hdev, }break ; } + +return 0 ; }
drivers/hid/hid-logitech-hidpp.c +3 -1
@@ -1285,13 +1285,15 @@ static void hidpp_populate_input(struct hidpp_device *hidpp,m560_populate_input (hidpp, input, origin_is_hid_core); } -static void hidpp_input_configured (struct hid_device *hdev, +static int hidpp_input_configured (struct hid_device *hdev,struct hid_input *hidinput) {struct hidpp_device *hidpp =hid_get_drvdata (hdev);struct input_dev *input = hidinput->input;hidpp_populate_input (hidpp, input, true); + +return 0 ; } static int hidpp_raw_hidpp_event(struct hidpp_device *hidpp, u8 *data,
drivers/hid/hid-magicmouse.c +6 -2
@@ -471,18 +471,22 @@ static int magicmouse_input_mapping(struct hid_device *hdev,return 0 ; } -static void magicmouse_input_configured (struct hid_device *hdev, +static int magicmouse_input_configured (struct hid_device *hdev,struct hid_input *hi) {struct magicmouse_sc *msc =hid_get_drvdata (hdev); +int ret; -int ret =magicmouse_setup_input (msc->input, hdev); + ret =magicmouse_setup_input (msc->input, hdev);if (ret) {hid_err (hdev,"magicmouse setup input failed (%d)\n" , ret);/* clean msc->input to notify probe() of the failure */ msc->input =NULL ; +return ret; } + +return 0 ; }
drivers/hid/hid-multitouch.c +14 -5
@@ -725,12 +725,13 @@ static void mt_touch_report(struct hid_device *hid, struct hid_report *report)mt_sync_frame (td, report->field[0 ]->hidinput->input); } -static void mt_touch_input_configured (struct hid_device *hdev, +static int mt_touch_input_configured (struct hid_device *hdev,struct hid_input *hi) {struct mt_device *td =hid_get_drvdata (hdev);struct mt_class *cls = &td->mtclass;struct input_dev *input = hi->input; +int ret;if (!td->maxcontacts) td->maxcontacts =MT_DEFAULT_MAXCONTACT ;
@@ -752,9 +753,12 @@ static void mt_touch_input_configured(struct hid_device *hdev,if (td->is_buttonpad)__set_bit (INPUT_PROP_BUTTONPAD , input->propbit); -input_mt_init_slots (input, td->maxcontacts, td->mt_flags); + ret =input_mt_init_slots (input, td->maxcontacts, td->mt_flags); +if (ret) +return ret; td->mt_flags =0 ; +return 0 ; } static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
@@ -930,15 +934,19 @@ static void mt_post_parse(struct mt_device *td) cls->quirks &= ~MT_QUIRK_CONTACT_CNT_ACCURATE ; } -static void mt_input_configured (struct hid_device *hdev,struct hid_input *hi) +static int mt_input_configured (struct hid_device *hdev,struct hid_input *hi) {struct mt_device *td =hid_get_drvdata (hdev);char *name;const char *suffix =NULL ;struct hid_field *field = hi->report->field[0 ]; +int ret =0 ; -if (hi->report->id == td->mt_report_id) -mt_touch_input_configured (hdev, hi); +if (hi->report->id == td->mt_report_id) { + ret =mt_touch_input_configured (hdev, hi); +if (ret) +return ret; + }/* * some egalax touchscreens have "application == HID_DG_TOUCHSCREEN"
@@ -989,6 +997,7 @@ static void mt_input_configured(struct hid_device *hdev, struct hid_input *hi) hi->input->name = name; } } +return ret; }static int mt_probe (struct hid_device *hdev,const struct hid_device_id *id)
drivers/hid/hid-ntrig.c +4 -2
@@ -859,14 +859,14 @@ not_claimed_input:return 1 ; } -static void ntrig_input_configured (struct hid_device *hid, +static int ntrig_input_configured (struct hid_device *hid,struct hid_input *hidinput) {struct input_dev *input = hidinput->input;if (hidinput->report->maxfield <1 ) -return ; +return 0 ;switch (hidinput->report->field[0 ]->application) {case HID_DG_PEN :
@@ -890,6 +890,8 @@ static void ntrig_input_configured(struct hid_device *hid,"N-Trig MultiTouch" ;break ; } + +return 0 ; }static int ntrig_probe (struct hid_device *hdev,const struct hid_device_id *id)
drivers/hid/hid-rmi.c +7 -4
@@ -1173,7 +1173,7 @@ static int rmi_populate(struct hid_device *hdev)return 0 ; } -static void rmi_input_configured (struct hid_device *hdev,struct hid_input *hi) +static int rmi_input_configured (struct hid_device *hdev,struct hid_input *hi) {struct rmi_data *data =hid_get_drvdata (hdev);struct input_dev *input = hi->input;
@@ -1185,10 +1185,10 @@ static void rmi_input_configured(struct hid_device *hdev, struct hid_input *hi)hid_dbg (hdev,"Opening low level driver\n" ); ret =hid_hw_open (hdev);if (ret) -return ; +return ret;if (!(data->device_flags &RMI_DEVICE )) -return ; +return -ENXIO ;/* Allow incoming hid reports */ hid_device_io_start (hdev);
@@ -1228,7 +1228,9 @@ static void rmi_input_configured(struct hid_device *hdev, struct hid_input *hi)input_set_abs_params (input,ABS_MT_TOUCH_MAJOR ,0 ,0x0f ,0 ,0 );input_set_abs_params (input,ABS_MT_TOUCH_MINOR ,0 ,0x0f ,0 ,0 ); -input_mt_init_slots (input, data->max_fingers,INPUT_MT_POINTER ); + ret =input_mt_init_slots (input, data->max_fingers,INPUT_MT_POINTER ); +if (ret <0 ) + goto exit;if (data->button_count) {__set_bit (EV_KEY , input->evbit);
@@ -1244,6 +1246,7 @@ static void rmi_input_configured(struct hid_device *hdev, struct hid_input *hi) exit:hid_device_io_stop (hdev);hid_hw_close (hdev); +return ret; } static int rmi_input_mapping(struct hid_device *hdev,
drivers/hid/hid-sony.c +10 -3
@@ -1360,20 +1360,27 @@ static int sony_register_touchpad(struct hid_input *hi, int touch_count,return 0 ; } -static void sony_input_configured (struct hid_device *hdev, +static int sony_input_configured (struct hid_device *hdev,struct hid_input *hidinput) {struct sony_sc *sc =hid_get_drvdata (hdev); +int ret;/* * The Dualshock 4 touchpad supports 2 touches and has a * resolution of 1920x942 (44.86 dots/mm). */ if (sc->quirks &DUALSHOCK4_CONTROLLER ) { -if (sony_register_touchpad (hidinput,2 ,1920 ,942 ) !=0 ) + ret =sony_register_touchpad (hidinput,2 ,1920 ,942 ); +if (ret) {hid_err (sc->hdev, -"Unable to initialize multi-touch slots\n" ); +"Unable to initialize multi-touch slots: %d\n" , + ret); +return ret; + } } + +return 0 ; }/*
drivers/hid/hid-uclogic.c +4 -2
@@ -731,7 +731,7 @@ static int uclogic_input_mapping(struct hid_device *hdev, struct hid_input *hi,return 0 ; } -static void uclogic_input_configured (struct hid_device *hdev, +static int uclogic_input_configured (struct hid_device *hdev,struct hid_input *hi) {char *name;
@@ -741,7 +741,7 @@ static void uclogic_input_configured(struct hid_device *hdev,/* no report associated (HID_QUIRK_MULTI_INPUT not set) */ if (!hi->report) -return ; +return 0 ; field = hi->report->field[0 ];
@@ -774,6 +774,8 @@ static void uclogic_input_configured(struct hid_device *hdev, hi->input->name = name; } } + +return 0 ; }/**
include/linux/hid.h +2 -2
@@ -698,8 +698,8 @@ struct hid_driver {int (*input_mapped)(struct hid_device *hdev,struct hid_input *hidinput,struct hid_field *field,struct hid_usage *usage,unsigned long **bit,int *max); -void (*input_configured)(struct hid_device *hdev, -struct hid_input *hidinput); +int (*input_configured)(struct hid_device *hdev, +struct hid_input *hidinput);void (*feature_mapping)(struct hid_device *hdev,struct hid_field *field,struct hid_usage *usage);
Signature · 9 lines
2.6.0.rc2.230.g3dd15c0 -- Dmitry -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi
Quoted 51 lines · Dmitry Torokhov
When configuring input device via
input_configuredcallback we may encounter errors (for exampleinput_mt_init_slots()may fail). Instead of continuing with half-initialized input device let's allow driver indicate failures.Signed-off-by Jaikumar Ganesh <[email protected]>Signed-off-by Arve Hjønnevåg <[email protected]>Signed-off-by Dmitry Torokhov <[email protected]>--- drivers/hid/hid-appleir.c | 4 +++- drivers/hid/hid-elo.c | 4 +++- drivers/hid/hid-input.c | 10 ++++++---- drivers/hid/hid-lenovo.c | 4 +++- drivers/hid/hid-logitech-hidpp.c | 4 +++- drivers/hid/hid-magicmouse.c | 8 ++++++-- drivers/hid/hid-multitouch.c | 19 ++++++++++++++----- drivers/hid/hid-ntrig.c | 6 ++++-- drivers/hid/hid-rmi.c | 11 +++++++---- drivers/hid/hid-sony.c | 13 ++++++++++--- drivers/hid/hid-uclogic.c | 6 ++++-- include/linux/hid.h | 4 ++-- 12 files changed, 65 insertions(+), 28 deletions(-)drivers/hid/hid-input.c +6
-4@@ -1510,8 +1510,9 @@ int hidinput_connect(struct hid_device *hid, unsigned int force)* UGCI) cram a lot of unrelated inputs into the * same interface. */ hidinput->report = report; -if (drv->input_configured) - drv->input_configured (hid, hidinput); +if (drv->input_configured && + drv->input_configured (hid, hidinput)) + goto out_cleanup;if (input_register_device (hidinput->input)) goto out_cleanup; hidinput =NULL ;@@ -1532,8 +1533,9 @@ int hidinput_connect(struct hid_device *hid, unsigned int force) }if (hidinput) { -if (drv->input_configured) - drv->input_configured (hid, hidinput); +if (drv->input_configured && + drv->input_configured (hid, hidinput)) + goto out_cleanup;if (input_register_device (hidinput->input)) goto out_cleanup; }
[snip]
Quoted 35 lines
drivers/hid/hid-multitouch.c +6
-2@@ -725,12 +725,13 @@ static void mt_touch_report(struct hid_device *hid, struct hid_report *report)mt_sync_frame (td, report->field[0 ]->hidinput->input); } -static void mt_touch_input_configured (struct hid_device *hdev, +static int mt_touch_input_configured (struct hid_device *hdev,struct hid_input *hi) {struct mt_device *td =hid_get_drvdata (hdev);struct mt_class *cls = &td->mtclass;struct input_dev *input = hi->input; +int ret;if (!td->maxcontacts) td->maxcontacts =MT_DEFAULT_MAXCONTACT ;@@ -752,9 +753,12 @@ static void mt_touch_input_configured(struct hid_device *hdev,if (td->is_buttonpad)__set_bit (INPUT_PROP_BUTTONPAD , input->propbit); -input_mt_init_slots (input, td->maxcontacts, td->mt_flags); + ret =input_mt_init_slots (input, td->maxcontacts, td->mt_flags); +if (ret) +return ret; td->mt_flags =0 ; +return 0 ; } static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,@@ -930,15 +934,19 @@ static void mt_post_parse(struct mt_device *td) cls->quirks &= ~MT_QUIRK_CONTACT_CNT_ACCURATE ;
drivers/hid/hid-multitouch.c static void mt_post_parse(struct mt_device *td) · line 943
Quoted 10 lines
drivers/hid/hid-multitouch.c +2
-1} -static void mt_input_configured (struct hid_device *hdev,struct hid_input *hi) +static int mt_input_configured (struct hid_device *hdev,struct hid_input *hi) {struct mt_device *td =hid_get_drvdata (hdev);char *name;const char *suffix =NULL ;struct hid_field *field = hi->report->field[0 ]; +int ret =0 ;
int ret;
Quoted 12 lines
drivers/hid/hid-multitouch.c +5
-2-if (hi->report->id == td->mt_report_id) -mt_touch_input_configured (hdev, hi); +if (hi->report->id == td->mt_report_id) { + ret =mt_touch_input_configured (hdev, hi); +if (ret) +return ret; + }/* * some egalax touchscreens have "application == HID_DG_TOUCHSCREEN"
drivers/hid/hid-multitouch.c static void mt_input_configured(struct hid_device *hdev, struct hid_input *hi) · line 1000
Quoted 4 lines
drivers/hid/hid-multitouch.c +1
-0@@ -989,6 +997,7 @@ static void mt_input_configured(struct hid_device *hdev, struct hid_input *hi) hi->input->name = name; } } +return ret;
return 0;
And maybe add an empty line before the final return, just like you did with all the other callbacks.
Quoted 3 lines
drivers/hid/hid-multitouch.c +0
-0}static int mt_probe (struct hid_device *hdev,const struct hid_device_id *id)
[snip]
Quoted 38 lines
drivers/hid/hid-rmi.c +6
-4@@ -1173,7 +1173,7 @@ static int rmi_populate(struct hid_device *hdev)return 0 ; } -static void rmi_input_configured (struct hid_device *hdev,struct hid_input *hi) +static int rmi_input_configured (struct hid_device *hdev,struct hid_input *hi) {struct rmi_data *data =hid_get_drvdata (hdev);struct input_dev *input = hi->input;@@ -1185,10 +1185,10 @@ static void rmi_input_configured(struct hid_device *hdev, struct hid_input *hi)hid_dbg (hdev,"Opening low level driver\n" ); ret =hid_hw_open (hdev);if (ret) -return ; +return ret;if (!(data->device_flags &RMI_DEVICE )) -return ; +return -ENXIO ;/* Allow incoming hid reports */ hid_device_io_start (hdev);@@ -1228,7 +1228,9 @@ static void rmi_input_configured(struct hid_device *hdev, struct hid_input *hi)input_set_abs_params (input,ABS_MT_TOUCH_MAJOR ,0 ,0x0f ,0 ,0 );input_set_abs_params (input,ABS_MT_TOUCH_MINOR ,0 ,0x0f ,0 ,0 ); -input_mt_init_slots (input, data->max_fingers,INPUT_MT_POINTER ); + ret =input_mt_init_slots (input, data->max_fingers,INPUT_MT_POINTER ); +if (ret <0 ) + goto exit;if (data->button_count) {__set_bit (EV_KEY , input->evbit);
drivers/hid/hid-rmi.c static void rmi_input_configured(struct hid_device *hdev, struct hid_input *hi) · line 1249
Quoted 4 lines
drivers/hid/hid-rmi.c +1
-0@@ -1244,6 +1246,7 @@ static void rmi_input_configured(struct hid_device *hdev, struct hid_input *hi) exit:hid_device_io_stop (hdev);hid_hw_close (hdev); +return ret;
rmi_probe() has an explicit comment that it *wants* hid_probe() to continue on failure, to make sure hidraw is loaded. Not sure what to make with that, but please either remove the comment in rmi_probe() or make sure to always return 0 from rmi_input_configured().
drivers/hid/hid-rmi.c static void rmi_input_configured(struct hid_device *hdev, struct hid_input *hi) · line 1252
Quoted 3 lines
drivers/hid/hid-rmi.c +0
-0} static int rmi_input_mapping(struct hid_device *hdev,
[snip]
Looks good to me (regardless of the nit-picks):
Thanks
David
Quoted 28 lines · Dmitry Torokhov
When configuring input device via
input_configuredcallback we may encounter errors (for exampleinput_mt_init_slots()may fail). Instead of continuing with half-initialized input device let's allow driver indicate failures.drivers/hid/hid-uclogic.c +2
-2@@ -731,7 +731,7 @@ static int uclogic_input_mapping(struct hid_device *hdev, struct hid_input *hi,return 0 ; } -static void uclogic_input_configured (struct hid_device *hdev, +static int uclogic_input_configured (struct hid_device *hdev,struct hid_input *hi) {char *name;@@ -741,7 +741,7 @@ static void uclogic_input_configured(struct hid_device *hdev,/* no report associated (HID_QUIRK_MULTI_INPUT not set) */ if (!hi->report) -return ; +return 0 ; field = hi->report->field[0 ];
drivers/hid/hid-uclogic.c static void uclogic_input_configured(struct hid_device *hdev, · line 781
Quoted 8 lines
drivers/hid/hid-uclogic.c +2
-0@@ -774,6 +774,8 @@ static void uclogic_input_configured(struct hid_device *hdev, hi->input->name = name; } } + +return 0 ; }/**
The hid-uclogic.c change looks perfectly fine to me.
Thank you, Dmitri.
The next step would be to report devm_kzalloc failure instead of ignoring it.
Nick
Hi David,
Quoted 95 lines · David Herrmann
Hi
Quoted 51 lines · Dmitry Torokhov
When configuring input device via
input_configuredcallback we may encounter errors (for exampleinput_mt_init_slots()may fail). Instead of continuing with half-initialized input device let's allow driver indicate failures.Signed-off-by Jaikumar Ganesh <[email protected]>Signed-off-by Arve Hjønnevåg <[email protected]>Signed-off-by Dmitry Torokhov <[email protected]>--- drivers/hid/hid-appleir.c | 4 +++- drivers/hid/hid-elo.c | 4 +++- drivers/hid/hid-input.c | 10 ++++++---- drivers/hid/hid-lenovo.c | 4 +++- drivers/hid/hid-logitech-hidpp.c | 4 +++- drivers/hid/hid-magicmouse.c | 8 ++++++-- drivers/hid/hid-multitouch.c | 19 ++++++++++++++----- drivers/hid/hid-ntrig.c | 6 ++++-- drivers/hid/hid-rmi.c | 11 +++++++---- drivers/hid/hid-sony.c | 13 ++++++++++--- drivers/hid/hid-uclogic.c | 6 ++++-- include/linux/hid.h | 4 ++-- 12 files changed, 65 insertions(+), 28 deletions(-)drivers/hid/hid-input.c +6
-4@@ -1510,8 +1510,9 @@ int hidinput_connect(struct hid_device *hid, unsigned int force)* UGCI) cram a lot of unrelated inputs into the * same interface. */ hidinput->report = report; -if (drv->input_configured) - drv->input_configured (hid, hidinput); +if (drv->input_configured && + drv->input_configured (hid, hidinput)) + goto out_cleanup;if (input_register_device (hidinput->input)) goto out_cleanup; hidinput =NULL ;@@ -1532,8 +1533,9 @@ int hidinput_connect(struct hid_device *hid, unsigned int force) }if (hidinput) { -if (drv->input_configured) - drv->input_configured (hid, hidinput); +if (drv->input_configured && + drv->input_configured (hid, hidinput)) + goto out_cleanup;if (input_register_device (hidinput->input)) goto out_cleanup; }[snip]
Quoted 37 lines
drivers/hid/hid-multitouch.c +6
-2@@ -725,12 +725,13 @@ static void mt_touch_report(struct hid_device *hid, struct hid_report *report)mt_sync_frame (td, report->field[0 ]->hidinput->input); } -static void mt_touch_input_configured (struct hid_device *hdev, +static int mt_touch_input_configured (struct hid_device *hdev,struct hid_input *hi) {struct mt_device *td =hid_get_drvdata (hdev);struct mt_class *cls = &td->mtclass;struct input_dev *input = hi->input; +int ret;if (!td->maxcontacts) td->maxcontacts =MT_DEFAULT_MAXCONTACT ;@@ -752,9 +753,12 @@ static void mt_touch_input_configured(struct hid_device *hdev,if (td->is_buttonpad)__set_bit (INPUT_PROP_BUTTONPAD , input->propbit); -input_mt_init_slots (input, td->maxcontacts, td->mt_flags); + ret =input_mt_init_slots (input, td->maxcontacts, td->mt_flags); +if (ret) +return ret; td->mt_flags =0 ; +return 0 ; } static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,@@ -930,15 +934,19 @@ static void mt_post_parse(struct mt_device *td) cls->quirks &= ~MT_QUIRK_CONTACT_CNT_ACCURATE ; }
Quoted 10 lines
drivers/hid/hid-multitouch.c static void mt_post_parse(struct mt_device *td) · line 943
Quoted 8 lines
drivers/hid/hid-multitouch.c +2
-1-static void mt_input_configured (struct hid_device *hdev,struct hid_input *hi) +static int mt_input_configured (struct hid_device *hdev,struct hid_input *hi) {struct mt_device *td =hid_get_drvdata (hdev);char *name;const char *suffix =NULL ;struct hid_field *field = hi->report->field[0 ]; +int ret =0 ;int ret;
Right.
Quoted 20 lines
Quoted 13 lines
drivers/hid/hid-multitouch.c +5
-2-if (hi->report->id == td->mt_report_id) -mt_touch_input_configured (hdev, hi); +if (hi->report->id == td->mt_report_id) { + ret =mt_touch_input_configured (hdev, hi); +if (ret) +return ret; + }/* * some egalax touchscreens have "application == HID_DG_TOUCHSCREEN" drivers/hid/hid-multitouch.c static void mt_input_configured(struct hid_device *hdev, struct hid_input *hi) · line 1000
Quoted 4 lines
drivers/hid/hid-multitouch.c +1
-0@@ -989,6 +997,7 @@ static void mt_input_configured(struct hid_device *hdev, struct hid_input *hi) hi->input->name = name; } } +return ret;return 0;
Quoted 2 lines
And maybe add an empty line before the final return, just like you did with all the other callbacks.
OK.
Quoted 42 lines
Quoted 4 lines
drivers/hid/hid-multitouch.c +0
-0}static int mt_probe (struct hid_device *hdev,const struct hid_device_id *id)[snip]
Quoted 35 lines
drivers/hid/hid-rmi.c +6
-4@@ -1173,7 +1173,7 @@ static int rmi_populate(struct hid_device *hdev)return 0 ; } -static void rmi_input_configured (struct hid_device *hdev,struct hid_input *hi) +static int rmi_input_configured (struct hid_device *hdev,struct hid_input *hi) {struct rmi_data *data =hid_get_drvdata (hdev);struct input_dev *input = hi->input;@@ -1185,10 +1185,10 @@ static void rmi_input_configured(struct hid_device *hdev, struct hid_input *hi)hid_dbg (hdev,"Opening low level driver\n" ); ret =hid_hw_open (hdev);if (ret) -return ; +return ret;if (!(data->device_flags &RMI_DEVICE )) -return ; +return -ENXIO ;/* Allow incoming hid reports */ hid_device_io_start (hdev);@@ -1228,7 +1228,9 @@ static void rmi_input_configured(struct hid_device *hdev, struct hid_input *hi)input_set_abs_params (input,ABS_MT_TOUCH_MAJOR ,0 ,0x0f ,0 ,0 );input_set_abs_params (input,ABS_MT_TOUCH_MINOR ,0 ,0x0f ,0 ,0 ); -input_mt_init_slots (input, data->max_fingers,INPUT_MT_POINTER ); + ret =input_mt_init_slots (input, data->max_fingers,INPUT_MT_POINTER ); +if (ret <0 ) + goto exit;
Quoted 12 lines
drivers/hid/hid-rmi.c static void rmi_input_configured(struct hid_device *hdev, struct hid_input *hi) · line 1249
Quoted 7 lines
drivers/hid/hid-rmi.c +1
-0if (data->button_count) {__set_bit (EV_KEY , input->evbit);@@ -1244,6 +1246,7 @@ static void rmi_input_configured(struct hid_device *hdev, struct hid_input *hi) exit:hid_device_io_stop (hdev);hid_hw_close (hdev); +return ret;
rmi_probe()has an explicit comment that it *wants*hid_probe()to continue on failure, to make sure hidraw is loaded. Not sure what to make with that, but please either remove the comment inrmi_probe()or make sure to always return 0 fromrmi_input_configured().
I think that comment is erroneous since the fact that we could not attach hidinput interface should not affect hidraw in any shape or form.
Andrew, can you double check?
Thanks.
Signature · 5 lines
Dmitry -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi
On Mon, Sep 28, 2015 at 2:23 AM, Dmitry Torokhov
<[email protected]> wrote:
[...]
Quoted 55 lines
Quoted 42 lines
Quoted 4 lines
}
static int
mt_probe(struct hid_device *hdev, const struct hid_device_id *id)[snip]
Quoted 35 lines
drivers/hid/hid-rmi.c +6
-4@@ -1173,7 +1173,7 @@ static int rmi_populate(struct hid_device *hdev)return 0 ; } -static void rmi_input_configured (struct hid_device *hdev,struct hid_input *hi) +static int rmi_input_configured (struct hid_device *hdev,struct hid_input *hi) {struct rmi_data *data =hid_get_drvdata (hdev);struct input_dev *input = hi->input;@@ -1185,10 +1185,10 @@ static void rmi_input_configured(struct hid_device *hdev, struct hid_input *hi)hid_dbg (hdev,"Opening low level driver\n" ); ret =hid_hw_open (hdev);if (ret) -return ; +return ret;if (!(data->device_flags &RMI_DEVICE )) -return ; +return -ENXIO ;/* Allow incoming hid reports */ hid_device_io_start (hdev);@@ -1228,7 +1228,9 @@ static void rmi_input_configured(struct hid_device *hdev, struct hid_input *hi)input_set_abs_params (input,ABS_MT_TOUCH_MAJOR ,0 ,0x0f ,0 ,0 );input_set_abs_params (input,ABS_MT_TOUCH_MINOR ,0 ,0x0f ,0 ,0 ); -input_mt_init_slots (input, data->max_fingers,INPUT_MT_POINTER ); + ret =input_mt_init_slots (input, data->max_fingers,INPUT_MT_POINTER ); +if (ret <0 ) + goto exit;Quoted 12 lines
drivers/hid/hid-rmi.c static void rmi_input_configured(struct hid_device *hdev, struct hid_input *hi) · line 1249
Quoted 7 lines
drivers/hid/hid-rmi.c +1
-0if (data->button_count) {__set_bit (EV_KEY , input->evbit);@@ -1244,6 +1246,7 @@ static void rmi_input_configured(struct hid_device *hdev, struct hid_input *hi) exit:hid_device_io_stop (hdev);hid_hw_close (hdev); +return ret;
rmi_probe()has an explicit comment that it *wants*hid_probe()to continue on failure, to make sure hidraw is loaded. Not sure what to make with that, but please either remove the comment inrmi_probe()or make sure to always return 0 fromrmi_input_configured().
Quoted 2 lines
I think that comment is erroneous since the fact that we could not attach hidinput interface should not affect hidraw in any shape or form.
The comment might indeed be correct. If rmi_input_configured() failed, probing is continued, but the device-internal state might be different. rmi_probe() checks that, and explicitly continues device probing in that case (if it didn't, the device would indeed be rejected).
Sorry for the confusion. Your changes to rmi do look correct.
Thanks
David
Quoted 30 lines · David Herrmann
Hi
On Mon, Sep 28, 2015 at 2:23 AM, Dmitry Torokhov
<[email protected]> wrote:
[...]Quoted 25 lines
Quoted 25 lines
Quoted 3 lines
}static int
mt_probe(struct hid_device *hdev, const struct hid_device_id *id)[snip]
Quoted 20 lines
drivers/hid/hid-rmi.c +2
-2@@ -1173,7 +1173,7 @@ static int rmi_populate(struct hid_device *hdev)return 0 ; } -static void rmi_input_configured (struct hid_device *hdev,struct hid_input *hi) +static int rmi_input_configured (struct hid_device *hdev,struct hid_input *hi) {struct rmi_data *data =hid_get_drvdata (hdev);struct input_dev *input = hi->input;@@ -1185,10 +1185,10 @@ static void rmi_input_configured(struct hid_device *hdev, struct hid_input *hi)hid_dbg (hdev,"Opening low level driver\n" ); ret =hid_hw_open (hdev);if (ret) -return ; +return ret;
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
drivers/hid/hid-rmi.c static void rmi_input_configured(struct hid_device *hdev, struct hid_input *hi) · line 1191
Quoted 3 lines
drivers/hid/hid-rmi.c +1
-1if (!(data->device_flags &RMI_DEVICE )) -return ; +return -ENXIO ;
We should return 0 here. Otherwise, this will break certain keyboards on composite USB devices which share a VID and PID with our touchpad. If the RMI_DEVICE flag is not set then hid-rmi will pass those reports onto hid-input for processing.
Quoted 24 lines
Quoted 22 lines
Quoted 11 lines
Quoted 11 lines
drivers/hid/hid-rmi.c +3
-1/* Allow incoming hid reports */ hid_device_io_start (hdev);@@ -1228,7 +1228,9 @@ static void rmi_input_configured(struct hid_device *hdev, struct hid_input *hi)input_set_abs_params (input,ABS_MT_TOUCH_MAJOR ,0 ,0x0f ,0 ,0 );input_set_abs_params (input,ABS_MT_TOUCH_MINOR ,0 ,0x0f ,0 ,0 ); -input_mt_init_slots (input, data->max_fingers,INPUT_MT_POINTER ); + ret =input_mt_init_slots (input, data->max_fingers,INPUT_MT_POINTER ); +if (ret <0 ) + goto exit;Quoted 11 lines
drivers/hid/hid-rmi.c static void rmi_input_configured(struct hid_device *hdev, struct hid_input *hi) · line 1249
Quoted 7 lines
drivers/hid/hid-rmi.c +1
-0if (data->button_count) {__set_bit (EV_KEY , input->evbit);@@ -1244,6 +1246,7 @@ static void rmi_input_configured(struct hid_device *hdev, struct hid_input *hi) exit:hid_device_io_stop (hdev);hid_hw_close (hdev); +return ret;
rmi_probe()has an explicit comment that it *wants*hid_probe()to continue on failure, to make sure hidraw is loaded. Not sure what to make with that, but please either remove the comment inrmi_probe()or make sure to always return 0 fromrmi_input_configured().Quoted 2 lines
I think that comment is erroneous since the fact that we could not attach hidinput interface should not affect hidraw in any shape or form.
Quoted 7 lines
The comment might indeed be correct. If
rmi_input_configured()failed, probing is continued, but the device-internal state might be different.rmi_probe()checks that, and explicitly continues device probing in that case (if it didn't, the device would indeed be rejected).Sorry for the confusion. Your changes to rmi do look correct.
I will fix the comment, it does incorrectly imply that returning an error from rmi_probe() would disconnect hidraw. It is also hard to understand without the context of the previous version. If you look at the change (daebdd7) it was the call to hid_hw_stop() which disconnected hidraw and not the return code, if rmi_populate() can't find F11 on the device.
Otherwise, the changes to rmi look correct.
Andrew
PATCH v2 1/1 HID: hid-input: allow input_configured callback return errors
In reply to Dmitry TorokhovWhen configuring input device via input_configured callback we may encounter errors (for example input_mt_init_slots() may fail). Instead of continuing with half-initialized input device let's allow driver indicate failures.
---
v1->v2:
- addressed David's comments re: hid-multitouch.c
- changed hid-rmi.c to not return error if device is not RMI one as mentioned by Andrew Duggan.
drivers/hid/hid-appleir.c | 4 +++- drivers/hid/hid-elo.c | 4 +++- drivers/hid/hid-input.c | 10 ++++++---- drivers/hid/hid-lenovo.c | 4 +++- drivers/hid/hid-logitech-hidpp.c | 4 +++- drivers/hid/hid-magicmouse.c | 8 ++++++-- drivers/hid/hid-multitouch.c | 20 +++++++++++++++----- drivers/hid/hid-ntrig.c | 6 ++++-- drivers/hid/hid-rmi.c | 11 +++++++---- drivers/hid/hid-sony.c | 13 ++++++++++--- drivers/hid/hid-uclogic.c | 6 ++++-- include/linux/hid.h | 4 ++-- 12 files changed, 66 insertions(+), 28 deletions(-)
drivers/hid/hid-appleir.c +3 -1
@@ -256,7 +256,7 @@ out:return 0 ; } -static void appleir_input_configured (struct hid_device *hid, +static int appleir_input_configured (struct hid_device *hid,struct hid_input *hidinput) {struct input_dev *input_dev = hidinput->input;
@@ -275,6 +275,8 @@ static void appleir_input_configured(struct hid_device *hid,for (i =0 ; i <ARRAY_SIZE (appleir_key_table); i++)set_bit (appleir->keymap[i], input_dev->keybit);clear_bit (KEY_RESERVED , input_dev->keybit); + +return 0 ; } static int appleir_input_mapping(struct hid_device *hid,
drivers/hid/hid-elo.c +3 -1
@@ -37,7 +37,7 @@ static bool use_fw_quirk = true;module_param (use_fw_quirk, bool,S_IRUGO );MODULE_PARM_DESC (use_fw_quirk,"Do periodic pokes for broken M firmwares (default = true)" ); -static void elo_input_configured (struct hid_device *hdev, +static int elo_input_configured (struct hid_device *hdev,struct hid_input *hidinput) {struct input_dev *input = hidinput->input;
@@ -45,6 +45,8 @@ static void elo_input_configured(struct hid_device *hdev,set_bit (BTN_TOUCH , input->keybit);set_bit (ABS_PRESSURE , input->absbit);input_set_abs_params (input,ABS_PRESSURE ,0 ,256 ,0 ,0 ); + +return 0 ; }static void elo_process_data (struct input_dev *input,const u8 *data,int size)
drivers/hid/hid-input.c +6 -4
@@ -1510,8 +1510,9 @@ int hidinput_connect(struct hid_device *hid, unsigned int force)* UGCI) cram a lot of unrelated inputs into the * same interface. */ hidinput->report = report; -if (drv->input_configured) - drv->input_configured (hid, hidinput); +if (drv->input_configured && + drv->input_configured (hid, hidinput)) + goto out_cleanup;if (input_register_device (hidinput->input)) goto out_cleanup; hidinput =NULL ;
@@ -1532,8 +1533,9 @@ int hidinput_connect(struct hid_device *hid, unsigned int force) }if (hidinput) { -if (drv->input_configured) - drv->input_configured (hid, hidinput); +if (drv->input_configured && + drv->input_configured (hid, hidinput)) + goto out_cleanup;if (input_register_device (hidinput->input)) goto out_cleanup; }
drivers/hid/hid-lenovo.c +3 -1
@@ -848,7 +848,7 @@ static void lenovo_remove(struct hid_device *hdev)hid_hw_stop (hdev); } -static void lenovo_input_configured (struct hid_device *hdev, +static int lenovo_input_configured (struct hid_device *hdev,struct hid_input *hi) {switch (hdev->product) {
@@ -863,6 +863,8 @@ static void lenovo_input_configured(struct hid_device *hdev, }break ; } + +return 0 ; }
drivers/hid/hid-logitech-hidpp.c +3 -1
@@ -1285,13 +1285,15 @@ static void hidpp_populate_input(struct hidpp_device *hidpp,m560_populate_input (hidpp, input, origin_is_hid_core); } -static void hidpp_input_configured (struct hid_device *hdev, +static int hidpp_input_configured (struct hid_device *hdev,struct hid_input *hidinput) {struct hidpp_device *hidpp =hid_get_drvdata (hdev);struct input_dev *input = hidinput->input;hidpp_populate_input (hidpp, input, true); + +return 0 ; } static int hidpp_raw_hidpp_event(struct hidpp_device *hidpp, u8 *data,
drivers/hid/hid-magicmouse.c +6 -2
@@ -471,18 +471,22 @@ static int magicmouse_input_mapping(struct hid_device *hdev,return 0 ; } -static void magicmouse_input_configured (struct hid_device *hdev, +static int magicmouse_input_configured (struct hid_device *hdev,struct hid_input *hi) {struct magicmouse_sc *msc =hid_get_drvdata (hdev); +int ret; -int ret =magicmouse_setup_input (msc->input, hdev); + ret =magicmouse_setup_input (msc->input, hdev);if (ret) {hid_err (hdev,"magicmouse setup input failed (%d)\n" , ret);/* clean msc->input to notify probe() of the failure */ msc->input =NULL ; +return ret; } + +return 0 ; }
drivers/hid/hid-multitouch.c +15 -5
@@ -725,12 +725,13 @@ static void mt_touch_report(struct hid_device *hid, struct hid_report *report)mt_sync_frame (td, report->field[0 ]->hidinput->input); } -static void mt_touch_input_configured (struct hid_device *hdev, +static int mt_touch_input_configured (struct hid_device *hdev,struct hid_input *hi) {struct mt_device *td =hid_get_drvdata (hdev);struct mt_class *cls = &td->mtclass;struct input_dev *input = hi->input; +int ret;if (!td->maxcontacts) td->maxcontacts =MT_DEFAULT_MAXCONTACT ;
@@ -752,9 +753,12 @@ static void mt_touch_input_configured(struct hid_device *hdev,if (td->is_buttonpad)__set_bit (INPUT_PROP_BUTTONPAD , input->propbit); -input_mt_init_slots (input, td->maxcontacts, td->mt_flags); + ret =input_mt_init_slots (input, td->maxcontacts, td->mt_flags); +if (ret) +return ret; td->mt_flags =0 ; +return 0 ; } static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
@@ -930,15 +934,19 @@ static void mt_post_parse(struct mt_device *td) cls->quirks &= ~MT_QUIRK_CONTACT_CNT_ACCURATE ; } -static void mt_input_configured (struct hid_device *hdev,struct hid_input *hi) +static int mt_input_configured (struct hid_device *hdev,struct hid_input *hi) {struct mt_device *td =hid_get_drvdata (hdev);char *name;const char *suffix =NULL ;struct hid_field *field = hi->report->field[0 ]; +int ret; -if (hi->report->id == td->mt_report_id) -mt_touch_input_configured (hdev, hi); +if (hi->report->id == td->mt_report_id) { + ret =mt_touch_input_configured (hdev, hi); +if (ret) +return ret; + }/* * some egalax touchscreens have "application == HID_DG_TOUCHSCREEN"
@@ -989,6 +997,8 @@ static void mt_input_configured(struct hid_device *hdev, struct hid_input *hi) hi->input->name = name; } } + +return 0 ; }static int mt_probe (struct hid_device *hdev,const struct hid_device_id *id)
drivers/hid/hid-ntrig.c +4 -2
@@ -859,14 +859,14 @@ not_claimed_input:return 1 ; } -static void ntrig_input_configured (struct hid_device *hid, +static int ntrig_input_configured (struct hid_device *hid,struct hid_input *hidinput) {struct input_dev *input = hidinput->input;if (hidinput->report->maxfield <1 ) -return ; +return 0 ;switch (hidinput->report->field[0 ]->application) {case HID_DG_PEN :
@@ -890,6 +890,8 @@ static void ntrig_input_configured(struct hid_device *hid,"N-Trig MultiTouch" ;break ; } + +return 0 ; }static int ntrig_probe (struct hid_device *hdev,const struct hid_device_id *id)
drivers/hid/hid-rmi.c +7 -4
@@ -1173,7 +1173,7 @@ static int rmi_populate(struct hid_device *hdev)return 0 ; } -static void rmi_input_configured (struct hid_device *hdev,struct hid_input *hi) +static int rmi_input_configured (struct hid_device *hdev,struct hid_input *hi) {struct rmi_data *data =hid_get_drvdata (hdev);struct input_dev *input = hi->input;
@@ -1185,10 +1185,10 @@ static void rmi_input_configured(struct hid_device *hdev, struct hid_input *hi)hid_dbg (hdev,"Opening low level driver\n" ); ret =hid_hw_open (hdev);if (ret) -return ; +return ret;if (!(data->device_flags &RMI_DEVICE )) -return ; +return 0 ;/* Allow incoming hid reports */ hid_device_io_start (hdev);
@@ -1228,7 +1228,9 @@ static void rmi_input_configured(struct hid_device *hdev, struct hid_input *hi)input_set_abs_params (input,ABS_MT_TOUCH_MAJOR ,0 ,0x0f ,0 ,0 );input_set_abs_params (input,ABS_MT_TOUCH_MINOR ,0 ,0x0f ,0 ,0 ); -input_mt_init_slots (input, data->max_fingers,INPUT_MT_POINTER ); + ret =input_mt_init_slots (input, data->max_fingers,INPUT_MT_POINTER ); +if (ret <0 ) + goto exit;if (data->button_count) {__set_bit (EV_KEY , input->evbit);
@@ -1244,6 +1246,7 @@ static void rmi_input_configured(struct hid_device *hdev, struct hid_input *hi) exit:hid_device_io_stop (hdev);hid_hw_close (hdev); +return ret; } static int rmi_input_mapping(struct hid_device *hdev,
drivers/hid/hid-sony.c +10 -3
@@ -1360,20 +1360,27 @@ static int sony_register_touchpad(struct hid_input *hi, int touch_count,return 0 ; } -static void sony_input_configured (struct hid_device *hdev, +static int sony_input_configured (struct hid_device *hdev,struct hid_input *hidinput) {struct sony_sc *sc =hid_get_drvdata (hdev); +int ret;/* * The Dualshock 4 touchpad supports 2 touches and has a * resolution of 1920x942 (44.86 dots/mm). */ if (sc->quirks &DUALSHOCK4_CONTROLLER ) { -if (sony_register_touchpad (hidinput,2 ,1920 ,942 ) !=0 ) + ret =sony_register_touchpad (hidinput,2 ,1920 ,942 ); +if (ret) {hid_err (sc->hdev, -"Unable to initialize multi-touch slots\n" ); +"Unable to initialize multi-touch slots: %d\n" , + ret); +return ret; + } } + +return 0 ; }/*
drivers/hid/hid-uclogic.c +4 -2
@@ -731,7 +731,7 @@ static int uclogic_input_mapping(struct hid_device *hdev, struct hid_input *hi,return 0 ; } -static void uclogic_input_configured (struct hid_device *hdev, +static int uclogic_input_configured (struct hid_device *hdev,struct hid_input *hi) {char *name;
@@ -741,7 +741,7 @@ static void uclogic_input_configured(struct hid_device *hdev,/* no report associated (HID_QUIRK_MULTI_INPUT not set) */ if (!hi->report) -return ; +return 0 ; field = hi->report->field[0 ];
@@ -774,6 +774,8 @@ static void uclogic_input_configured(struct hid_device *hdev, hi->input->name = name; } } + +return 0 ; }/**
include/linux/hid.h +2 -2
@@ -698,8 +698,8 @@ struct hid_driver {int (*input_mapped)(struct hid_device *hdev,struct hid_input *hidinput,struct hid_field *field,struct hid_usage *usage,unsigned long **bit,int *max); -void (*input_configured)(struct hid_device *hdev, -struct hid_input *hidinput); +int (*input_configured)(struct hid_device *hdev, +struct hid_input *hidinput);void (*feature_mapping)(struct hid_device *hdev,struct hid_field *field,struct hid_usage *usage);
Signature · 8 lines
2.6.0.rc2.230.g3dd15c0 -- Dmitry -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 4 lines · Dmitry Torokhov
When configuring input device via
input_configuredcallback we may encounter errors (for exampleinput_mt_init_slots()may fail). Instead of continuing with half-initialized input device let's allow driver indicate failures.
Applied to hid.git#for-4.4/upstream, thanks Dmitry.
Signature · 2 lines
Jiri Kosina SUSE Labs