From: Jonas Gorski Date: Wed, 10 Jun 2015 09:21:36 +0000 (+0000) Subject: b53: fix memory out of bounds access on 64 bit targets X-Git-Tag: reboot~2814 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9fbd6d0ba0af16648e9d6b70bab953184a263d94;p=oweals%2Fopenwrt.git b53: fix memory out of bounds access on 64 bit targets On device reset the sizes for the vlan and port tables were wrongly calculated based on the pointer size instead of the struct size. This causes buffer overruns on 64 bit targets, resulting in panics. Fix this by dereferencing the pointers. Reported-by: Fedor Konstantinov Signed-off-by: Jonas Gorski SVN-Revision: 45938 --- diff --git a/target/linux/generic/files/drivers/net/phy/b53/b53_common.c b/target/linux/generic/files/drivers/net/phy/b53/b53_common.c index 2b05d5d464..47b5a8b03f 100644 --- a/target/linux/generic/files/drivers/net/phy/b53/b53_common.c +++ b/target/linux/generic/files/drivers/net/phy/b53/b53_common.c @@ -803,8 +803,8 @@ static int b53_global_reset_switch(struct switch_dev *dev) priv->enable_jumbo = 0; priv->allow_vid_4095 = 0; - memset(priv->vlans, 0, sizeof(priv->vlans) * dev->vlans); - memset(priv->ports, 0, sizeof(priv->ports) * dev->ports); + memset(priv->vlans, 0, sizeof(*priv->vlans) * dev->vlans); + memset(priv->ports, 0, sizeof(*priv->ports) * dev->ports); return b53_switch_reset(priv); }