Commit 1ef3d8fb authored by Dan Carpenter's avatar Dan Carpenter Committed by Anton Vorontsov

max17042_battery: Fix a couple buffer overflows

There are a couple issues here caused by confusion between sizeof()
and ARRAY_SIZE().  "table_size" should be the number of elements, but we
should allocate it with kcalloc() so that we allocate the correct number
of bytes.

In max17042_init_model() we don't allocate enough space so we go past
the end of the array in max17042_read_model_data() and
max17042_model_data_compare().

In max17042_verify_model_lock() we allocate the right amount of space
but we call max17042_read_model_data() with the wrong number of elements
and also in the for loop we go past the end of the array.
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Acked-by: default avatarDirk Brandewie <dirk.brandewie@gmail.com>
Signed-off-by: default avatarAnton Vorontsov <anton.vorontsov@linaro.org>
parent 69964ea4
...@@ -325,11 +325,10 @@ static inline int max17042_model_data_compare(struct max17042_chip *chip, ...@@ -325,11 +325,10 @@ static inline int max17042_model_data_compare(struct max17042_chip *chip,
static int max17042_init_model(struct max17042_chip *chip) static int max17042_init_model(struct max17042_chip *chip)
{ {
int ret; int ret;
int table_size = int table_size = ARRAY_SIZE(chip->pdata->config_data->cell_char_tbl);
sizeof(chip->pdata->config_data->cell_char_tbl)/sizeof(u16);
u16 *temp_data; u16 *temp_data;
temp_data = kzalloc(table_size, GFP_KERNEL); temp_data = kcalloc(table_size, sizeof(*temp_data), GFP_KERNEL);
if (!temp_data) if (!temp_data)
return -ENOMEM; return -ENOMEM;
...@@ -354,12 +353,11 @@ static int max17042_init_model(struct max17042_chip *chip) ...@@ -354,12 +353,11 @@ static int max17042_init_model(struct max17042_chip *chip)
static int max17042_verify_model_lock(struct max17042_chip *chip) static int max17042_verify_model_lock(struct max17042_chip *chip)
{ {
int i; int i;
int table_size = int table_size = ARRAY_SIZE(chip->pdata->config_data->cell_char_tbl);
sizeof(chip->pdata->config_data->cell_char_tbl);
u16 *temp_data; u16 *temp_data;
int ret = 0; int ret = 0;
temp_data = kzalloc(table_size, GFP_KERNEL); temp_data = kcalloc(table_size, sizeof(*temp_data), GFP_KERNEL);
if (!temp_data) if (!temp_data)
return -ENOMEM; return -ENOMEM;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment