hak5
/
openwrt-owl
mirror of https://github.com/hak5/openwrt-owl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

generic: mvswitch: add detach callback 

Use the detach callback to disable packet mangling
to avoid possible NULL pointer dereference.

Compile tested only.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 35512
owl
Gabor Juhos 2013-02-07 15:18:34 +00:00
parent 4be8c22e74
commit c130a3feac
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
target/linux/generic/files/drivers/net/phy/mvswitch.c
View File

@ -348,16 +348,26 @@ mvswitch_config_aneg(struct phy_device *phydev)
} }
static void static void
mvswitch_remove(struct phy_device *pdev) mvswitch_detach(struct phy_device *pdev)
{ {
struct mvswitch_priv *priv = to_mvsw(pdev); struct mvswitch_priv *priv = to_mvsw(pdev);
struct net_device *dev = pdev->attached_dev; struct net_device *dev = pdev->attached_dev;
if (!dev)
return;
dev->phy_ptr = NULL; dev->phy_ptr = NULL;
dev->eth_mangle_rx = NULL; dev->eth_mangle_rx = NULL;
dev->eth_mangle_tx = NULL; dev->eth_mangle_tx = NULL;
dev->features = priv->orig_features; dev->features = priv->orig_features;
dev->priv_flags &= ~IFF_NO_IP_ALIGN; dev->priv_flags &= ~IFF_NO_IP_ALIGN;
}
static void
mvswitch_remove(struct phy_device *pdev)
{
struct mvswitch_priv *priv = to_mvsw(pdev);
kfree(priv); kfree(priv);
} }
@ -399,6 +409,7 @@ static struct phy_driver mvswitch_driver = {
.features = PHY_BASIC_FEATURES, .features = PHY_BASIC_FEATURES,
.probe = &mvswitch_probe, .probe = &mvswitch_probe,
.remove = &mvswitch_remove, .remove = &mvswitch_remove,
.detach = &mvswitch_detach,
.config_init = &mvswitch_config_init, .config_init = &mvswitch_config_init,
.config_aneg = &mvswitch_config_aneg, .config_aneg = &mvswitch_config_aneg,
.read_status = &mvswitch_read_status, .read_status = &mvswitch_read_status,