Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Input: atmel_mxt_ts - fix a few issues reported by Coverity

This should fix the following issues reported by Coverity:

*** CID 1230625: Logically dead code (DEADCODE)
/drivers/input/touchscreen/atmel_mxt_ts.c: 1692 in mxt_initialize()

*** CID 1230627: Missing break in switch (MISSING_BREAK)
/drivers/input/touchscreen/atmel_mxt_ts.c: 1436 in mxt_get_object_table()

*** CID 1230629: Out-of-bounds write (OVERRUN)
/drivers/input/touchscreen/atmel_mxt_ts.c: 1267 in mxt_update_cfg()

*** CID 1230632: Unused pointer value (UNUSED_VALUE)
/drivers/input/touchscreen/atmel_mxt_ts.c: 1211 in mxt_update_cfg()

Acked-by: Nick Dyer <nick.dyer@itdev.co.uk>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

+11 -6
+11 -6
drivers/input/touchscreen/atmel_mxt_ts.c
··· 1098 1098 /* Skip object */ 1099 1099 for (i = 0; i < size; i++) { 1100 1100 ret = sscanf(cfg->data + data_pos, "%hhx%n", 1101 - &val, 1102 - &offset); 1101 + &val, &offset); 1102 + if (ret != 1) { 1103 + dev_err(dev, "Bad format in T%d at %d\n", 1104 + type, i); 1105 + return -EINVAL; 1106 + } 1103 1107 data_pos += offset; 1104 1108 } 1105 1109 continue; ··· 1143 1139 &val, 1144 1140 &offset); 1145 1141 if (ret != 1) { 1146 - dev_err(dev, "Bad format in T%d\n", type); 1142 + dev_err(dev, "Bad format in T%d at %d\n", 1143 + type, i); 1147 1144 return -EINVAL; 1148 1145 } 1149 1146 data_pos += offset; ··· 1154 1149 1155 1150 byte_offset = reg + i - cfg_start_ofs; 1156 1151 1157 - if (byte_offset >= 0 && 1158 - byte_offset <= config_mem_size) { 1152 + if (byte_offset >= 0 && byte_offset < config_mem_size) { 1159 1153 *(config_mem + byte_offset) = val; 1160 1154 } else { 1161 1155 dev_err(dev, "Bad object: reg:%d, T%d, ofs=%d\n", ··· 1458 1454 data->T5_msg_size = mxt_obj_size(object) - 1; 1459 1455 } 1460 1456 data->T5_address = object->start_address; 1457 + break; 1461 1458 case MXT_GEN_COMMAND_T6: 1462 1459 data->T6_reportid = min_id; 1463 1460 data->T6_address = object->start_address; ··· 1712 1707 return error; 1713 1708 } 1714 1709 1715 - mxt_acquire_irq(data); 1710 + error = mxt_acquire_irq(data); 1716 1711 if (error) 1717 1712 goto err_free_object_table; 1718 1713