diff options
| author | Ben Hutchings <ben.hutchings@codethink.co.uk> | 2018-06-19 20:17:32 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-06-22 02:20:41 +0200 |
| commit | 50fc7b61959af4b95fafce7fe5dd565199e0b61a (patch) | |
| tree | fe2962d4ef55cc1b49a52abbb8b913fff2ec1eb4 /drivers/input/mouse/elan_i2c.h | |
| parent | Input: elan_i2c - add ELAN0618 (Lenovo v330 15IKB) ACPI ID (diff) | |
| download | linux-50fc7b61959af4b95fafce7fe5dd565199e0b61a.tar.xz linux-50fc7b61959af4b95fafce7fe5dd565199e0b61a.zip | |
Input: elan_i2c_smbus - fix more potential stack buffer overflows
Commit 40f7090bb1b4 ("Input: elan_i2c_smbus - fix corrupted stack")
fixed most of the functions using i2c_smbus_read_block_data() to
allocate a buffer with the maximum block size. However three
functions were left unchanged:
* In elan_smbus_initialize(), increase the buffer size in the same
way.
* In elan_smbus_calibrate_result(), the buffer is provided by the
caller (calibrate_store()), so introduce a bounce buffer. Also
name the result buffer size.
* In elan_smbus_get_report(), the buffer is provided by the caller
but happens to be the right length. Add a compile-time assertion
to ensure this remains the case.
Cc: <stable@vger.kernel.org> # 3.19+
Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/mouse/elan_i2c.h')
| -rw-r--r-- | drivers/input/mouse/elan_i2c.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/input/mouse/elan_i2c.h b/drivers/input/mouse/elan_i2c.h index 599544c1a91c..243e0fa6e3e3 100644 --- a/drivers/input/mouse/elan_i2c.h +++ b/drivers/input/mouse/elan_i2c.h @@ -27,6 +27,8 @@ #define ETP_DISABLE_POWER 0x0001 #define ETP_PRESSURE_OFFSET 25 +#define ETP_CALIBRATE_MAX_LEN 3 + /* IAP Firmware handling */ #define ETP_PRODUCT_ID_FORMAT_STRING "%d.0" #define ETP_FW_NAME "elan_i2c_" ETP_PRODUCT_ID_FORMAT_STRING ".bin" |