Skip to content

Commit b93eb56

Browse files
a3fkuba-moo
authored andcommitted
net: dsa: realtek: fix out-of-bounds access
The probe function sets priv->chip_data to (void *)priv + sizeof(*priv) with the expectation that priv has enough trailing space. However, only realtek-smi actually allocated this chip_data space. Do likewise in realtek-mdio to fix out-of-bounds accesses. These accesses likely went unnoticed so far, because of an (unused) buf[4096] member in struct realtek_priv, which caused kmalloc to round up the allocated buffer to a big enough size, so nothing of value was overwritten. With a different allocator (like in the barebox bootloader port of the driver) or with KASAN, the memory corruption becomes quickly apparent. Fixes: aac9400 ("net: dsa: realtek: add new mdio interface for drivers") Reviewed-by: Florian Fainelli <[email protected]> Reviewed-by: Luiz Angelo Daros de Luca <[email protected]> Reviewed-by: Alvin Šipraga <[email protected]> Reviewed-by: Linus Walleij <[email protected]> Signed-off-by: Ahmad Fatoum <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 82e2c39 commit b93eb56

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

drivers/net/dsa/realtek/realtek-mdio.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
#include <linux/module.h>
2323
#include <linux/of_device.h>
24+
#include <linux/overflow.h>
2425
#include <linux/regmap.h>
2526

2627
#include "realtek.h"
@@ -152,7 +153,9 @@ static int realtek_mdio_probe(struct mdio_device *mdiodev)
152153
if (!var)
153154
return -EINVAL;
154155

155-
priv = devm_kzalloc(&mdiodev->dev, sizeof(*priv), GFP_KERNEL);
156+
priv = devm_kzalloc(&mdiodev->dev,
157+
size_add(sizeof(*priv), var->chip_data_sz),
158+
GFP_KERNEL);
156159
if (!priv)
157160
return -ENOMEM;
158161

0 commit comments

Comments
 (0)