redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

otgcontrol: add synch. to device-connected sysfs prop./fix pinctrl read bug 

Device-connected sysfs property is vulnerable for simultanious access by
IRQ handler and sysfs property show handler.

Fix bug causing kernel stack-dump/crash when trying to read current pinctrl state through sysfs property
pull/10/head
Steinar Bakkemo 2019-08-19 22:59:35 +02:00
parent 914d0eaeb4
commit fea66edaed
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/misc/rm-otgcontrol/otgcontrol_onewire.c
View File

@ -339,14 +339,21 @@ static void otgcontrol_gpio_irq_work(struct work_struct *work)
otgc_data->one_wire_gpio_state = cur_gpio_state;
if (otgc_data->one_wire_gpio_state ==
OTG1_ONEWIRE_GPIO_STATE__DEVICE_CONNECTED)
OTG1_ONEWIRE_GPIO_STATE__DEVICE_CONNECTED) {
SYNC_SET_FLAG(otgc_data->otg1_device_connected,
&otgc_data->lock);
otgcontrol_handleInput(otgc_data,
OTG1_EVENT__DEVICE_CONNECTED,
NULL);
else
}
else {
SYNC_CLEAR_FLAG(otgc_data->otg1_device_connected,
&otgc_data->lock);
otgcontrol_handleInput(otgc_data,
OTG1_EVENT__DEVICE_DISCONNECTED,
NULL);
}
}
SYNC_CLEAR_FLAG(otgc_data->one_wire_gpio_irq_is_handling,

18
drivers/misc/rm-otgcontrol/otgcontrol_sysfs.c
View File

@ -59,7 +59,8 @@ static ssize_t attribute_show(struct kobject *kobj,
dev_dbg(otgc_data->dev,
"%s: Returning cur otg1_device_connected value (%d)\n",
__func__,
otgc_data->otg1_device_connected);
SYNC_GET_FLAG(otgc_data->otg1_device_connected,
&otgc_data->lock));
var = otgc_data->otg1_device_connected;
}
@ -96,12 +97,23 @@ static ssize_t attribute_show(struct kobject *kobj,
var = otgc_data->otg1_controllermode;
}
else if (strcmp(attr->attr.name, "otg1_pinctrlstate") == 0) {
otgc_data = to_otgcontrol_data(attr,
otg1_pinctrlstate_attribute);
dev_dbg(otgc_data->dev,
"%s: Returning cur pinctrlstate (%d)\n",
__func__,
otgc_data->otg1_pinctrlstate);
var = otgc_data->otg1_pinctrlstate;
}
else {
dev_dbg(otgc_data->dev,
"%s: Invalid attribute name (%s)\n",
"%s: Invalid attribute name (%s), returning 0\n",
__func__,
attr->attr.name);
return -EINVAL;
var = 0;
}
return sprintf(buf, "%d\n", var);