mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 02:30:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtc: pcf85063: fix potential OOB write in PCF85063 NVMEM read

Browse source 
The nvmem interface supports variable buffer sizes, while the regmap
interface operates with fixed-size storage. If an nvmem client uses a
buffer size less than 4 bytes, regmap_read will write out of bounds
as it expects the buffer to point at an unsigned int.

Fix this by using an intermediary unsigned int to hold the value.

Fixes: fadfd092ee ("rtc: pcf85063: add nvram support")
Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Link: https://lore.kernel.org/r/20241218-rtc-pcf85063-stack-corruption-v1-1-12fd0ee0f046@pengutronix.de
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
This commit is contained in:
Oleksij Rempel 2024-12-18 20:34:58 +01:00 committed by Alexandre Belloni
parent 09c4a61015
commit 3ab8c5ed4f
1 changed files with 10 additions and 1 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/rtc/rtc-pcf85063.c
View file

@ -322,7 +322,16 @@ static const struct rtc_class_ops pcf85063_rtc_ops = {
static int pcf85063_nvmem_read(void *priv, unsigned int offset, static int pcf85063_nvmem_read(void *priv, unsigned int offset,
void *val, size_t bytes) void *val, size_t bytes)
{ {
return regmap_read(priv, PCF85063_REG_RAM, val); unsigned int tmp;
int ret;
ret = regmap_read(priv, PCF85063_REG_RAM, &tmp);
if (ret < 0)
return ret;
*(u8 *)val = tmp;
return 0;
} }
static int pcf85063_nvmem_write(void *priv, unsigned int offset, static int pcf85063_nvmem_write(void *priv, unsigned int offset,