summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFerruh Yigit <fery@cypress.com>2013-05-23 09:56:55 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-06-27 11:27:33 -0700
commit8c428c194065e000d4138123f147bc74f7532bbc (patch)
tree28cc19f2beaa37f23092216ef53d4bb424e91e97
parent322130dea90940d65b811bd67790aecf86e6340f (diff)
downloadlinux-3.10-8c428c194065e000d4138123f147bc74f7532bbc.tar.gz
linux-3.10-8c428c194065e000d4138123f147bc74f7532bbc.tar.bz2
linux-3.10-8c428c194065e000d4138123f147bc74f7532bbc.zip
Input: cyttsp - fix memcpy size param
commit d2983cdb480157f637df07723f28aaa657b1080d upstream. memcpy param is wrong because of offset in bl_cmd, this may corrupt the stack which may cause a crash. Tested-by: Ferruh Yigit <fery@cypress.com> on TMA300-DVK Signed-off-by: Ferruh Yigit <fery@cypress.com> Acked-by: Javier Martinez Canillas <javier@dowhile0.org> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/input/touchscreen/cyttsp_core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/cyttsp_core.c b/drivers/input/touchscreen/cyttsp_core.c
index f030d9ec795..3f505d5e848 100644
--- a/drivers/input/touchscreen/cyttsp_core.c
+++ b/drivers/input/touchscreen/cyttsp_core.c
@@ -133,7 +133,7 @@ static int cyttsp_exit_bl_mode(struct cyttsp *ts)
memcpy(bl_cmd, bl_command, sizeof(bl_command));
if (ts->pdata->bl_keys)
memcpy(&bl_cmd[sizeof(bl_command) - CY_NUM_BL_KEYS],
- ts->pdata->bl_keys, sizeof(bl_command));
+ ts->pdata->bl_keys, CY_NUM_BL_KEYS);
error = ttsp_write_block_data(ts, CY_REG_BASE,
sizeof(bl_cmd), bl_cmd);