diff options
| author |   Dan Carpenter <dan.carpenter@oracle.com> | 2019-02-06 18:35:15 +0300 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-02-06 13:42:54 -0800 |
| commit | 00670cb8a73b10b10d3c40f045c15411715e4465 (patch) | |
| tree | c6ea6278589659c3bbd1144abaf0bde8409382ce /net/dsa | |
| parent | MAINTAINERS: add maintainer for SFF/SFP/SFP+ support (diff) | |
| download | linux-dev-00670cb8a73b10b10d3c40f045c15411715e4465.tar.xz linux-dev-00670cb8a73b10b10d3c40f045c15411715e4465.zip | |
net: dsa: Fix NULL checking in dsa_slave_set_eee()
This function can't succeed if dp->pl is NULL. It will Oops inside the
call to return phylink_ethtool_get_eee(dp->pl, e);
Fixes: 1be52e97ed3e ("dsa: slave: eee: Allow ports to use phylink")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Reviewed-by: Vivien Didelot <vivien.didelot@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dsa')
| -rw-r--r-- | net/dsa/slave.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/dsa/slave.c b/net/dsa/slave.c index b5e44825d173..a1c9fe155057 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -642,7 +642,7 @@ static int dsa_slave_set_eee(struct net_device *dev, struct ethtool_eee *e) int ret; /* Port's PHY and MAC both need to be EEE capable */ - if (!dev->phydev && !dp->pl) + if (!dev->phydev || !dp->pl) return -ENODEV; if (!ds->ops->set_mac_eee) @@ -662,7 +662,7 @@ static int dsa_slave_get_eee(struct net_device *dev, struct ethtool_eee *e) int ret; /* Port's PHY and MAC both need to be EEE capable */ - if (!dev->phydev && !dp->pl) + if (!dev->phydev || !dp->pl) return -ENODEV; if (!ds->ops->get_mac_eee) |