]> git.baikalelectronics.ru Git - kernel.git/commit
power: generic-adc-battery: fix out-of-bounds write when copying channel properties
authorH. Nikolaus Schaller <hns@goldelico.com>
Tue, 26 Jun 2018 13:28:29 +0000 (15:28 +0200)
committerSebastian Reichel <sre@kernel.org>
Fri, 6 Jul 2018 16:40:34 +0000 (18:40 +0200)
commit6ff41e688e9a7833fb27e73df74584b8ceff5032
tree36b5965a6ea63bdec16c0056551533df38f90979
parent6ec002cd668fb0791d48ffd8b5c5a279e205bef9
power: generic-adc-battery: fix out-of-bounds write when copying channel properties

We did have sporadic problems in the pinctrl framework during boot
where a pin group name unexpectedly became NULL leading to a NULL
dereference in strcmp.

Detailled analysis of the failing cases did reveal that there were
two devm allocated objects close to each other. The second one was
the affected group_desc in pinmux and the first one was the
psy_desc->properties buffer of the gab driver.

Review of the gab code showed that the address calculation for
one memcpy() is wrong. It does

properties + sizeof(type) * index

but C is defined to do the index multiplication already for
pointer + integer additions. Hence the factor was applied twice
and the memcpy() does write outside of the properties buffer.
Sometimes it happened to be the pinctrl and triggered the strcmp(NULL).

Anyways, it is overkill to use a memcpy() here instead of a simple
assignment, which is easier to read and has less risk for wrong
address calculations. So we change code to a simple assignment.

If we initialize the index to the first free location, we can even
remove the local variable 'properties'.

This bug seems to exist right from the beginning in 3.7-rc1 in

commit 145f42ec4e7d ("power: battery: Generic battery driver using IIO")

Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
Cc: stable@vger.kernel.org
Fixes: 145f42ec4e7d ("power: battery: Generic battery driver using IIO")
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
drivers/power/supply/generic-adc-battery.c