evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

input: synaptics_dsx_2.6: fix issues raised by static analyzer

Browse source 
Fix issues raised by static analyzer:
1. initialize "retval" before being returned from the driver function.
2. Check return value of the function create_singlethread_workqueue()
   and return -ENOMEM if it failed. If creation of the workqueue
   failed, then both queue_work() and queue_delayed_work() calls will
   later crash, as they expect the workqueue pointer to be a non-NULL
   value. Also add clean-up code for this.
3. check return value of the snprintf() call as array 'buf' of size
   16 may use index value(s) 16...20.

CRs-Fixed: 995687
Change-Id: I89d9f7cacbcf23de43a7e96556d1ac65911126d6
Signed-off-by: Shantanu Jain <shjain@codeaurora.org>
This commit is contained in:
Shantanu Jain 2016-03-23 16:28:50 +05:30 • committed by Abinaya P
parent 11edf4f33c
commit 29e0ce3c54
2 changed files with 30 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
drivers/input/touchscreen/synaptics_dsx_2.6/synaptics_dsx_core.c
View file

@ -3140,7 +3140,9 @@ static int synaptics_rmi4_gpio_setup(int gpio, bool config, int dir, int state)
unsigned char buf[16]; unsigned char buf[16];
if (config) { if (config) {
snprintf(buf, PAGE_SIZE, "dsx_gpio_%u\n", gpio); retval = snprintf(buf, ARRAY_SIZE(buf), "dsx_gpio_%u\n", gpio);
if (retval >= 16)
return -EINVAL;
retval = gpio_request(gpio, buf); retval = gpio_request(gpio, buf);
if (retval) { if (retval) {
@ -4080,19 +4082,29 @@ static int synaptics_rmi4_probe(struct platform_device *pdev)
rmi4_data->rb_workqueue = rmi4_data->rb_workqueue =
create_singlethread_workqueue("dsx_rebuild_workqueue"); create_singlethread_workqueue("dsx_rebuild_workqueue");
if (!rmi4_data->rb_workqueue) {
retval = -ENOMEM;
goto err_rb_workqueue;
}
INIT_DELAYED_WORK(&rmi4_data->rb_work, synaptics_rmi4_rebuild_work); INIT_DELAYED_WORK(&rmi4_data->rb_work, synaptics_rmi4_rebuild_work);
exp_data.workqueue = create_singlethread_workqueue("dsx_exp_workqueue"); exp_data.workqueue = create_singlethread_workqueue("dsx_exp_workqueue");
if (!exp_data.workqueue) {
retval = -ENOMEM;
goto err_exp_data_workqueue;
}
INIT_DELAYED_WORK(&exp_data.work, synaptics_rmi4_exp_fn_work); INIT_DELAYED_WORK(&exp_data.work, synaptics_rmi4_exp_fn_work);
exp_data.rmi4_data = rmi4_data; exp_data.rmi4_data = rmi4_data;
exp_data.queue_work = true; exp_data.queue_work = true;
queue_delayed_work(exp_data.workqueue, queue_delayed_work(exp_data.workqueue, &exp_data.work, 0);
&exp_data.work,
0);
#ifdef FB_READY_RESET #ifdef FB_READY_RESET
rmi4_data->reset_workqueue = rmi4_data->reset_workqueue =
create_singlethread_workqueue("dsx_reset_workqueue"); create_singlethread_workqueue("dsx_reset_workqueue");
if (!rmi4_data->reset_workqueue) {
retval = -ENOMEM;
goto err_reset_workqueue;
}
INIT_WORK(&rmi4_data->reset_work, synaptics_rmi4_reset_work); INIT_WORK(&rmi4_data->reset_work, synaptics_rmi4_reset_work);
queue_work(rmi4_data->reset_workqueue, &rmi4_data->reset_work); queue_work(rmi4_data->reset_workqueue, &rmi4_data->reset_work);
#endif #endif
@ -4103,6 +4115,19 @@ static int synaptics_rmi4_probe(struct platform_device *pdev)
return retval; return retval;
#ifdef FB_READY_RESET
err_reset_workqueue:
#endif
cancel_delayed_work_sync(&exp_data.work);
flush_workqueue(exp_data.workqueue);
destroy_workqueue(exp_data.workqueue);
err_exp_data_workqueue:
cancel_delayed_work_sync(&rmi4_data->rb_work);
flush_workqueue(rmi4_data->rb_workqueue);
destroy_workqueue(rmi4_data->rb_workqueue);
err_rb_workqueue:
err_sysfs: err_sysfs:
for (attr_count--; attr_count >= 0; attr_count--) { for (attr_count--; attr_count >= 0; attr_count--) {
sysfs_remove_file(&rmi4_data->input_dev->dev.kobj, sysfs_remove_file(&rmi4_data->input_dev->dev.kobj,

2
drivers/input/touchscreen/synaptics_dsx_2.6/synaptics_dsx_i2c.c
View file

@ -291,7 +291,7 @@ static void synaptics_rmi4_i2c_check_addr(struct synaptics_rmi4_data *rmi4_data,
static int synaptics_rmi4_i2c_set_page(struct synaptics_rmi4_data *rmi4_data, static int synaptics_rmi4_i2c_set_page(struct synaptics_rmi4_data *rmi4_data,
unsigned short addr) unsigned short addr)
{ {
int retval; int retval = 0;
unsigned char retry; unsigned char retry;
unsigned char buf[PAGE_SELECT_LEN]; unsigned char buf[PAGE_SELECT_LEN];
unsigned char page; unsigned char page;